Update modules

This commit is contained in:
Gergely Polonkai 2016-04-26 13:40:21 +02:00
parent 373cecf125
commit c33a88558b
130 changed files with 836 additions and 698 deletions

View File

@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
;;;### (autoloads nil "async" "async.el" (22221 60697 422000 0))
;;;### (autoloads nil "async" "async.el" (22303 19287 502173 365000))
;;; Generated autoloads from async.el
(autoload 'async-start-process "async" "\
@ -68,8 +68,8 @@ returns nil. It can still be useful, however, as an argument to
;;;***
;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22221
;;;;;; 60697 419000 0))
;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22303
;;;;;; 19287 498173 368000))
;;; Generated autoloads from async-bytecomp.el
(autoload 'async-byte-recompile-directory "async-bytecomp" "\
@ -96,8 +96,8 @@ Async compilation of packages can be controlled by
;;;***
;;;### (autoloads nil "dired-async" "dired-async.el" (22221 60697
;;;;;; 412000 0))
;;;### (autoloads nil "dired-async" "dired-async.el" (22303 19287
;;;;;; 486173 378000))
;;; Generated autoloads from dired-async.el
(defvar dired-async-mode nil "\
@ -116,8 +116,8 @@ Do dired actions asynchronously.
;;;***
;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22221
;;;;;; 60697 432884 878000))
;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22303
;;;;;; 19287 520307 139000))
;;;***

View File

@ -1,4 +1,4 @@
(define-package "async" "20160223.146" "Asynchronous processing in Emacs" 'nil :keywords
(define-package "async" "20160425.551" "Asynchronous processing in Emacs" 'nil :keywords
'("async")
:url "http://elpa.gnu.org/packages/async.html")
;; Local Variables:

View File

@ -166,7 +166,8 @@ See `dired-create-files' for the behavior of arguments."
(downcase operation) from)))
(if (not to)
(setq skipped (cons (dired-make-relative from) skipped))
(let* ((overwrite (file-exists-p to))
(let* ((overwrite (and (null (eq file-creator 'backup-file))
(file-exists-p to)))
(dired-overwrite-confirmed ; for dired-handle-overwrite
(and overwrite
(let ((help-form '(format "\
@ -255,8 +256,31 @@ ESC or `q' to not overwrite any of the remaining files,
,(async-inject-variables dired-async-env-variables-regexp)
(condition-case err
(let ((dired-recursive-copies (quote always)))
(cl-loop for (f . d) in (quote ,async-fn-list)
do (funcall (quote ,file-creator) f d t)))
;; Inline `backup-file' as long as it is not
;; available in emacs.
(defalias 'backup-file
;; Same feature as "cp --backup=numbered from to"
;; Symlinks are copied as file from source unlike
;; `dired-copy-file' which is same as cp -d.
;; Directories are omitted.
(lambda (from to ok)
(cond ((file-directory-p from) (ignore))
(t (let ((count 0))
(while (let ((attrs (file-attributes to)))
(and attrs (null (nth 0 attrs))))
(cl-incf count)
(setq to (concat (file-name-sans-versions to)
(format ".~%s~" count)))))
(condition-case err
(copy-file from to ok dired-copy-preserve-time)
(file-date-error
(push (dired-make-relative from)
dired-create-files-failures)
(dired-log "Can't set date on %s:\n%s\n" from err)))))))
;; Now run the FILE-CREATOR function on files.
(cl-loop with fn = (quote ,file-creator)
for (from . dest) in (quote ,async-fn-list)
do (funcall fn from dest t)))
(file-error
(with-temp-file ,dired-async-log-file
(insert (format "%S" err)))))

View File

@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
;;;### (autoloads nil "company" "company.el" (22297 19838 628699
;;;;;; 424000))
;;;### (autoloads nil "company" "company.el" (22303 19286 146174
;;;;;; 415000))
;;; Generated autoloads from company.el
(autoload 'company-mode "company" "\
@ -73,8 +73,8 @@ inserted.
;;;***
;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22297
;;;;;; 19840 603664 101000))
;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22303
;;;;;; 19286 222174 356000))
;;; Generated autoloads from company-abbrev.el
(autoload 'company-abbrev "company-abbrev" "\
@ -84,8 +84,8 @@ inserted.
;;;***
;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22297 19840
;;;;;; 163671 971000))
;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22303 19286
;;;;;; 206174 368000))
;;; Generated autoloads from company-bbdb.el
(autoload 'company-bbdb "company-bbdb" "\
@ -95,8 +95,8 @@ inserted.
;;;***
;;;### (autoloads nil "company-css" "company-css.el" (22297 19838
;;;;;; 501701 694000))
;;;### (autoloads nil "company-css" "company-css.el" (22303 19286
;;;;;; 142174 418000))
;;; Generated autoloads from company-css.el
(autoload 'company-css "company-css" "\
@ -106,8 +106,8 @@ inserted.
;;;***
;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22297
;;;;;; 19839 391685 775000))
;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22303
;;;;;; 19286 178174 390000))
;;; Generated autoloads from company-dabbrev.el
(autoload 'company-dabbrev "company-dabbrev" "\
@ -118,7 +118,7 @@ dabbrev-like `company-mode' completion backend.
;;;***
;;;### (autoloads nil "company-dabbrev-code" "company-dabbrev-code.el"
;;;;;; (22297 19839 228688 691000))
;;;;;; (22303 19286 170174 396000))
;;; Generated autoloads from company-dabbrev-code.el
(autoload 'company-dabbrev-code "company-dabbrev-code" "\
@ -130,8 +130,8 @@ comments or strings.
;;;***
;;;### (autoloads nil "company-elisp" "company-elisp.el" (22297 19840
;;;;;; 862659 468000))
;;;### (autoloads nil "company-elisp" "company-elisp.el" (22303 19286
;;;;;; 242174 341000))
;;; Generated autoloads from company-elisp.el
(autoload 'company-elisp "company-elisp" "\
@ -141,8 +141,8 @@ comments or strings.
;;;***
;;;### (autoloads nil "company-etags" "company-etags.el" (22297 19838
;;;;;; 926694 94000))
;;;### (autoloads nil "company-etags" "company-etags.el" (22303 19286
;;;;;; 154174 409000))
;;; Generated autoloads from company-etags.el
(autoload 'company-etags "company-etags" "\
@ -152,8 +152,8 @@ comments or strings.
;;;***
;;;### (autoloads nil "company-files" "company-files.el" (22297 19839
;;;;;; 535683 204000))
;;;### (autoloads nil "company-files" "company-files.el" (22303 19286
;;;;;; 182174 387000))
;;; Generated autoloads from company-files.el
(autoload 'company-files "company-files" "\
@ -165,8 +165,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-gtags" "company-gtags.el" (22297 19837
;;;;;; 942711 689000))
;;;### (autoloads nil "company-gtags" "company-gtags.el" (22303 19286
;;;;;; 114174 440000))
;;; Generated autoloads from company-gtags.el
(autoload 'company-gtags "company-gtags" "\
@ -176,8 +176,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-ispell" "company-ispell.el" (22297
;;;;;; 19840 704662 296000))
;;;### (autoloads nil "company-ispell" "company-ispell.el" (22303
;;;;;; 19286 230174 350000))
;;; Generated autoloads from company-ispell.el
(autoload 'company-ispell "company-ispell" "\
@ -187,8 +187,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-keywords" "company-keywords.el" (22297
;;;;;; 19839 758679 212000))
;;;### (autoloads nil "company-keywords" "company-keywords.el" (22303
;;;;;; 19286 194174 378000))
;;; Generated autoloads from company-keywords.el
(autoload 'company-keywords "company-keywords" "\
@ -198,8 +198,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-nxml" "company-nxml.el" (22297 19840
;;;;;; 287669 753000))
;;;### (autoloads nil "company-nxml" "company-nxml.el" (22303 19286
;;;;;; 210174 365000))
;;; Generated autoloads from company-nxml.el
(autoload 'company-nxml "company-nxml" "\
@ -209,8 +209,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22297
;;;;;; 19838 346704 465000))
;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22303
;;;;;; 19286 134174 424000))
;;; Generated autoloads from company-oddmuse.el
(autoload 'company-oddmuse "company-oddmuse" "\
@ -220,8 +220,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-semantic" "company-semantic.el" (22297
;;;;;; 19838 125708 417000))
;;;### (autoloads nil "company-semantic" "company-semantic.el" (22303
;;;;;; 19286 122174 434000))
;;; Generated autoloads from company-semantic.el
(autoload 'company-semantic "company-semantic" "\
@ -231,8 +231,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-tempo" "company-tempo.el" (22297 19839
;;;;;; 349686 528000))
;;;### (autoloads nil "company-tempo" "company-tempo.el" (22303 19286
;;;;;; 174174 393000))
;;; Generated autoloads from company-tempo.el
(autoload 'company-tempo "company-tempo" "\
@ -242,8 +242,8 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-xcode" "company-xcode.el" (22297 19840
;;;;;; 505665 854000))
;;;### (autoloads nil "company-xcode" "company-xcode.el" (22303 19286
;;;;;; 218174 359000))
;;; Generated autoloads from company-xcode.el
(autoload 'company-xcode "company-xcode" "\
@ -254,7 +254,7 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-yasnippet" "company-yasnippet.el"
;;;;;; (22297 19840 373668 214000))
;;;;;; (22303 19286 214174 362000))
;;; Generated autoloads from company-yasnippet.el
(autoload 'company-yasnippet "company-yasnippet" "\
@ -286,7 +286,7 @@ shadow backends that come after it. Recommended usages:
;;;### (autoloads nil nil ("company-capf.el" "company-clang.el" "company-cmake.el"
;;;;;; "company-eclim.el" "company-pkg.el" "company-template.el")
;;;;;; (22297 19841 194698 166000))
;;;;;; (22303 19286 253549 387000))
;;;***

View File

@ -50,7 +50,7 @@
(interactive (company-begin-backend 'company-bbdb))
(prefix (and (memq major-mode company-bbdb-modes)
(featurep 'bbdb-com)
(looking-back "^\\(To\\|Cc\\|Bcc\\): *.*?\\([^,; ]*\\)"
(looking-back "^\\(To\\|Cc\\|Bcc\\): *.*? *\\([^,;]*\\)"
(line-beginning-position))
(match-string-no-properties 2)))
(candidates (company-bbdb--candidates arg))

View File

@ -79,7 +79,7 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'."
:type 'boolean
:package-version '(company . "0.9.0"))
(defmacro company-dabrev--time-limit-while (test start limit freq &rest body)
(defmacro company-dabbrev--time-limit-while (test start limit freq &rest body)
(declare (indent 3) (debug t))
`(let ((company-time-limit-while-counter 0))
(catch 'done
@ -107,7 +107,7 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'."
(goto-char (if pos (1- pos) (point-min)))
;; Search before pos.
(let ((tmp-end (point)))
(company-dabrev--time-limit-while (> tmp-end (point-min))
(company-dabbrev--time-limit-while (> tmp-end (point-min))
start limit 1
(ignore-errors
(forward-char -10000))
@ -123,7 +123,7 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'."
(setq tmp-end (point))))
(goto-char (or pos (point-min)))
;; Search after pos.
(company-dabrev--time-limit-while (re-search-forward regexp nil t)
(company-dabbrev--time-limit-while (re-search-forward regexp nil t)
start limit 25
(if (and ignore-comments (save-match-data (company-in-string-or-comment)))
(re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t)

View File

@ -1,4 +1,4 @@
(define-package "company" "20160413.1347" "Modular text completion framework"
(define-package "company" "20160424.1521" "Modular text completion framework"
'((emacs "24.1")
(cl-lib "0.5"))
:url "http://company-mode.github.io/" :keywords

View File

@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
;;;### (autoloads nil "git-commit" "git-commit.el" (22297 19830 709841
;;;;;; 48000))
;;;### (autoloads nil "git-commit" "git-commit.el" (22303 19285 486174
;;;;;; 926000))
;;; Generated autoloads from git-commit.el
(defvar global-git-commit-mode t "\
@ -25,11 +25,6 @@ provide such a commit message.
\(fn &optional ARG)" t nil)
;;;***
;;;### (autoloads nil nil ("git-commit-pkg.el") (22297 19831 32984
;;;;;; 389000))
;;;***
;; Local Variables:

View File

@ -1 +1 @@
(define-package "git-commit" "20160414.251" "Edit Git commit messages" '((emacs "24.4") (dash "20151021.113") (with-editor "20160408.201")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
(define-package "git-commit" "20160425.430" "Edit Git commit messages" '((emacs "24.4") (dash "20151021.113") (with-editor "20160408.201")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))

View File

@ -13,7 +13,7 @@
;; Package-Requires: ((emacs "24.4") (dash "20151021.113") (with-editor "20160408.201"))
;; Keywords: git tools vc
;; Package-Version: 20160414.251
;; Package-Version: 20160425.430
;; Homepage: https://github.com/magit/magit
;; This file is not part of GNU Emacs.

View File

@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22297 20826
;;;;;; 911994 142000))
;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22303 19284
;;;;;; 902175 378000))
;;; Generated autoloads from helm-adaptive.el
(defvar helm-adaptive-mode nil "\
@ -29,8 +29,8 @@ Useful when you have a old or corrupted `helm-adaptive-history-file'.
;;;***
;;;### (autoloads nil "helm-apt" "helm-apt.el" (22297 20826 663998
;;;;;; 593000))
;;;### (autoloads nil "helm-apt" "helm-apt.el" (22303 19284 870175
;;;;;; 403000))
;;; Generated autoloads from helm-apt.el
(autoload 'helm-apt "helm-apt" "\
@ -41,8 +41,8 @@ With a prefix arg reload cache.
;;;***
;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22297 20827
;;;;;; 343986 390000))
;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22303 19284
;;;;;; 950175 341000))
;;; Generated autoloads from helm-bookmark.el
(autoload 'helm-bookmarks "helm-bookmark" "\
@ -59,8 +59,8 @@ only if external library addressbook-bookmark.el is available.
;;;***
;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22297 20826
;;;;;; 572000 244000))
;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22303 19284
;;;;;; 854175 415000))
;;; Generated autoloads from helm-buffers.el
(autoload 'helm-buffers-list "helm-buffers" "\
@ -75,8 +75,8 @@ Preconfigured `helm' lightweight version (buffer -> recentf).
;;;***
;;;### (autoloads nil "helm-color" "helm-color.el" (22297 20827 210988
;;;;;; 776000))
;;;### (autoloads nil "helm-color" "helm-color.el" (22303 19284 930175
;;;;;; 357000))
;;; Generated autoloads from helm-color.el
(autoload 'helm-colors "helm-color" "\
@ -86,8 +86,8 @@ Preconfigured `helm' for color.
;;;***
;;;### (autoloads nil "helm-command" "helm-command.el" (22297 20826
;;;;;; 137008 49000))
;;;### (autoloads nil "helm-command" "helm-command.el" (22303 19284
;;;;;; 806175 452000))
;;; Generated autoloads from helm-command.el
(autoload 'helm-M-x "helm-command" "\
@ -103,8 +103,8 @@ You can get help on each command by persistent action.
;;;***
;;;### (autoloads nil "helm-config" "helm-config.el" (22297 20827
;;;;;; 301987 144000))
;;;### (autoloads nil "helm-config" "helm-config.el" (22303 19284
;;;;;; 942175 347000))
;;; Generated autoloads from helm-config.el
(autoload 'helm-configuration "helm-config" "\
@ -114,8 +114,8 @@ Customize `helm'.
;;;***
;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22297 20826
;;;;;; 746997 104000))
;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22303 19284
;;;;;; 882175 394000))
;;; Generated autoloads from helm-dabbrev.el
(autoload 'helm-dabbrev "helm-dabbrev" "\
@ -125,8 +125,8 @@ Preconfigured helm for dynamic abbreviations.
;;;***
;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22297 20827 256987
;;;;;; 951000))
;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22303 19284 934175
;;;;;; 353000))
;;; Generated autoloads from helm-elisp.el
(autoload 'helm-lisp-completion-at-point "helm-elisp" "\
@ -180,7 +180,7 @@ Preconfigured helm for complex command history.
;;;***
;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el"
;;;;;; (22297 20826 183007 225000))
;;;;;; (22303 19284 810175 449000))
;;; Generated autoloads from helm-elisp-package.el
(autoload 'helm-list-elisp-packages "helm-elisp-package" "\
@ -196,8 +196,8 @@ Same as `helm-list-elisp-packages' but don't fetch packages on remote.
;;;***
;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22297 20826
;;;;;; 63009 378000))
;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22303 19284
;;;;;; 794175 462000))
;;; Generated autoloads from helm-elscreen.el
(autoload 'helm-elscreen "helm-elscreen" "\
@ -212,8 +212,8 @@ Preconfigured helm to list elscreen in history order.
;;;***
;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22297 20826
;;;;;; 307004 999000))
;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22303 19284
;;;;;; 826175 437000))
;;; Generated autoloads from helm-eshell.el
(autoload 'helm-esh-pcomplete "helm-eshell" "\
@ -228,8 +228,8 @@ Preconfigured helm for eshell history.
;;;***
;;;### (autoloads nil "helm-eval" "helm-eval.el" (22297 20826 994992
;;;;;; 653000))
;;;### (autoloads nil "helm-eval" "helm-eval.el" (22303 19284 910175
;;;;;; 372000))
;;; Generated autoloads from helm-eval.el
(autoload 'helm-eval-expression "helm-eval" "\
@ -249,8 +249,8 @@ Preconfigured helm for `helm-source-calculation-result'.
;;;***
;;;### (autoloads nil "helm-external" "helm-external.el" (22297 20825
;;;;;; 971011 29000))
;;;### (autoloads nil "helm-external" "helm-external.el" (22303 19284
;;;;;; 786175 468000))
;;; Generated autoloads from helm-external.el
(autoload 'helm-run-external-command "helm-external" "\
@ -263,8 +263,8 @@ You can set your own list of commands with
;;;***
;;;### (autoloads nil "helm-files" "helm-files.el" (22297 20826 787996
;;;;;; 368000))
;;;### (autoloads nil "helm-files" "helm-files.el" (22303 19284 886175
;;;;;; 391000))
;;; Generated autoloads from helm-files.el
(autoload 'helm-browse-project "helm-files" "\
@ -322,8 +322,8 @@ Preconfigured `helm' for `recentf'.
;;;***
;;;### (autoloads nil "helm-font" "helm-font.el" (22297 20826 353004
;;;;;; 173000))
;;;### (autoloads nil "helm-font" "helm-font.el" (22303 19284 830175
;;;;;; 434000))
;;; Generated autoloads from helm-font.el
(autoload 'helm-select-xfont "helm-font" "\
@ -338,8 +338,8 @@ Preconfigured helm for `ucs-names' math symbols.
;;;***
;;;### (autoloads nil "helm-grep" "helm-grep.el" (22297 20827 384985
;;;;;; 653000))
;;;### (autoloads nil "helm-grep" "helm-grep.el" (22303 19284 954175
;;;;;; 338000))
;;; Generated autoloads from helm-grep.el
(autoload 'helm-goto-precedent-file "helm-grep" "\
@ -366,8 +366,8 @@ With a prefix arg ARG git-grep the whole repository.
;;;***
;;;### (autoloads nil "helm-help" "helm-help.el" (22297 20825 925011
;;;;;; 854000))
;;;### (autoloads nil "helm-help" "helm-help.el" (22303 19284 782175
;;;;;; 471000))
;;; Generated autoloads from helm-help.el
(autoload 'helm-documentation "helm-help" "\
@ -393,8 +393,8 @@ HELM-ATTRIBUTE should be a symbol.
;;;***
;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22297 20826
;;;;;; 617999 418000))
;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22303 19284
;;;;;; 862175 409000))
;;; Generated autoloads from helm-id-utils.el
(autoload 'helm-gid "helm-id-utils" "\
@ -408,8 +408,8 @@ See <https://www.gnu.org/software/idutils/>.
;;;***
;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22297 20826 481001
;;;;;; 877000))
;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22303 19284 846175
;;;;;; 421000))
;;; Generated autoloads from helm-imenu.el
(autoload 'helm-imenu "helm-imenu" "\
@ -424,8 +424,8 @@ Preconfigured helm for fetching imenu entries of all buffers.
;;;***
;;;### (autoloads nil "helm-info" "helm-info.el" (22297 20826 398003
;;;;;; 366000))
;;;### (autoloads nil "helm-info" "helm-info.el" (22303 19284 838175
;;;;;; 427000))
;;; Generated autoloads from helm-info.el
(autoload 'helm-info "helm-info" "\
@ -441,8 +441,8 @@ With a prefix-arg insert symbol at point.
;;;***
;;;### (autoloads nil "helm-locate" "helm-locate.el" (22297 20826
;;;;;; 17010 203000))
;;;### (autoloads nil "helm-locate" "helm-locate.el" (22303 19284
;;;;;; 790175 465000))
;;; Generated autoloads from helm-locate.el
(autoload 'helm-projects-find-files "helm-locate" "\
@ -469,8 +469,8 @@ Where db_path is a filename matched by
;;;***
;;;### (autoloads nil "helm-man" "helm-man.el" (22297 20827 40991
;;;;;; 828000))
;;;### (autoloads nil "helm-man" "helm-man.el" (22303 19284 914175
;;;;;; 369000))
;;; Generated autoloads from helm-man.el
(autoload 'helm-man-woman "helm-man" "\
@ -481,8 +481,8 @@ With a prefix arg reinitialize the cache.
;;;***
;;;### (autoloads nil "helm-misc" "helm-misc.el" (22297 20826 870994
;;;;;; 878000))
;;;### (autoloads nil "helm-misc" "helm-misc.el" (22303 19284 898175
;;;;;; 381000))
;;; Generated autoloads from helm-misc.el
(autoload 'helm-browse-menubar "helm-misc" "\
@ -523,8 +523,8 @@ Preconfigured `helm' that provide completion of `comint' history.
;;;***
;;;### (autoloads nil "helm-mode" "helm-mode.el" (22297 20825 796014
;;;;;; 170000))
;;;### (autoloads nil "helm-mode" "helm-mode.el" (22303 19284 766175
;;;;;; 484000))
;;; Generated autoloads from helm-mode.el
(autoload 'helm-comp-read "helm-mode" "\
@ -691,8 +691,8 @@ Note: This mode is incompatible with Emacs23.
;;;***
;;;### (autoloads nil "helm-net" "helm-net.el" (22297 20827 169989
;;;;;; 513000))
;;;### (autoloads nil "helm-net" "helm-net.el" (22303 19284 926175
;;;;;; 360000))
;;; Generated autoloads from helm-net.el
(autoload 'helm-surfraw "helm-net" "\
@ -712,8 +712,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest.
;;;***
;;;### (autoloads nil "helm-org" "helm-org.el" (22297 20827 426984
;;;;;; 900000))
;;;### (autoloads nil "helm-org" "helm-org.el" (22303 19284 958175
;;;;;; 335000))
;;; Generated autoloads from helm-org.el
(autoload 'helm-org-agenda-files-headings "helm-org" "\
@ -744,8 +744,8 @@ Preconfigured helm for org templates.
;;;***
;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22297 20827
;;;;;; 127990 267000))
;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22303 19284
;;;;;; 922175 363000))
;;; Generated autoloads from helm-regexp.el
(autoload 'helm-moccur-mode "helm-regexp" "\
@ -784,8 +784,8 @@ The prefix arg can be set before calling
;;;***
;;;### (autoloads nil "helm-ring" "helm-ring.el" (22297 20825 884012
;;;;;; 590000))
;;;### (autoloads nil "helm-ring" "helm-ring.el" (22303 19284 778175
;;;;;; 474000))
;;; Generated autoloads from helm-ring.el
(defvar helm-push-mark-mode nil "\
@ -842,8 +842,8 @@ This command is useful when used with persistent action.
;;;***
;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22297 20826
;;;;;; 523001 123000))
;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22303 19284
;;;;;; 850175 418000))
;;; Generated autoloads from helm-semantic.el
(autoload 'helm-semantic "helm-semantic" "\
@ -865,8 +865,8 @@ Fill in the symbol at point by default.
;;;***
;;;### (autoloads nil "helm-sys" "helm-sys.el" (22297 20826 704997
;;;;;; 857000))
;;;### (autoloads nil "helm-sys" "helm-sys.el" (22303 19284 874175
;;;;;; 400000))
;;; Generated autoloads from helm-sys.el
(autoload 'helm-top "helm-sys" "\
@ -886,8 +886,8 @@ Preconfigured helm for xrandr.
;;;***
;;;### (autoloads nil "helm-tags" "helm-tags.el" (22297 20826 262005
;;;;;; 807000))
;;;### (autoloads nil "helm-tags" "helm-tags.el" (22303 19284 822175
;;;;;; 440000))
;;; Generated autoloads from helm-tags.el
(autoload 'helm-etags-select "helm-tags" "\
@ -906,8 +906,8 @@ This function aggregates three sources of tag files:
;;;***
;;;### (autoloads nil "helm-utils" "helm-utils.el" (22297 20826 91008
;;;;;; 876000))
;;;### (autoloads nil "helm-utils" "helm-utils.el" (22303 19284 798175
;;;;;; 459000))
;;; Generated autoloads from helm-utils.el
(defvar helm-popup-tip-mode nil "\
@ -927,8 +927,8 @@ Show help-echo informations in a popup tip at end of line.
;;;***
;;;### (autoloads nil nil ("helm-easymenu.el" "helm-multi-match.el"
;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-types.el") (22297 20827
;;;;;; 514325 542000))
;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-types.el") (22303 19284
;;;;;; 973293 164000))
;;;***

View File

@ -324,10 +324,10 @@ See `ido-make-buffer-list' for more infos."
(size (propertize (helm-buffer-size buf)
'face 'helm-buffer-size))
(proc (get-buffer-process buf))
(dir (with-current-buffer buffer (abbreviate-file-name default-directory)))
(dir (with-current-buffer buffer (helm-aif default-directory (abbreviate-file-name it))))
(file-name (helm-aif (buffer-file-name buf) (abbreviate-file-name it)))
(name (buffer-name buf))
(name-prefix (when (file-remote-p dir)
(name-prefix (when (and dir (file-remote-p dir))
(propertize "@ " 'face 'helm-ff-prefix))))
;; No fancy things on remote buffers.
(if (and name-prefix helm-buffer-skip-remote-checking)

View File

@ -54,6 +54,7 @@
(defvar recentf-list)
(defvar helm-mm-matching-method)
(defvar dired-async-mode)
(defgroup helm-files nil
@ -476,6 +477,7 @@ Don't set it directly, use instead `helm-ff-auto-update-initial-value'.")
"Delete File(s) `M-D'" 'helm-delete-marked-files
"Copy file(s) `M-C, C-u to follow'" 'helm-find-files-copy
"Rename file(s) `M-R, C-u to follow'" 'helm-find-files-rename
"Backup files" 'helm-find-files-backup
"Symlink files(s) `M-S, C-u to follow'" 'helm-find-files-symlink
"Relsymlink file(s) `C-u to follow'" 'helm-find-files-relsymlink
"Hardlink file(s) `M-H, C-u to follow'" 'helm-find-files-hardlink
@ -569,6 +571,22 @@ of current buffer."
;; staying in the directory visited instead of current.
(or (car-safe helm-ff-history) default-directory))))))
(defun helm-ff--count-and-collect-dups (files)
(cl-loop with dups = (make-hash-table :test 'equal)
for f in files
for file = (if (file-directory-p f)
(concat (helm-basename f) "/")
(helm-basename f))
for count = (gethash file dups)
if count do (puthash file (1+ count) dups)
else do (puthash file 1 dups)
finally return (cl-loop for k being the hash-keys in dups
using (hash-value v)
if (> v 1)
collect (format "%s(%s)" k v)
else
collect k)))
(defun helm-find-files-do-action (action)
"Generic function for creating actions from `helm-source-find-files'.
ACTION must be an action supported by `helm-dired-action'."
@ -584,11 +602,7 @@ ACTION must be an action supported by `helm-dired-action'."
helm-ff-auto-update-initial-value
(dest (with-helm-display-marked-candidates
helm-marked-buffer-name
(mapcar (lambda (f)
(if (file-directory-p f)
(concat (helm-basename f) "/")
(helm-basename f)))
ifiles)
(helm-ff--count-and-collect-dups ifiles)
(with-helm-current-buffer
(helm-read-file-name
prompt
@ -604,6 +618,13 @@ ACTION must be an action supported by `helm-dired-action'."
"Copy files from `helm-find-files'."
(helm-find-files-do-action 'copy))
(defun helm-find-files-backup (_candidate)
"Backup files from `helm-find-files'.
This reproduce the behavior of \"cp --backup=numbered from to\"."
(cl-assert (and (fboundp 'dired-async-mode) dired-async-mode) nil
"Backup only available when `dired-async-mode' is enabled")
(helm-find-files-do-action 'backup))
(defun helm-find-files-rename (_candidate)
"Rename files from `helm-find-files'."
(helm-find-files-do-action 'rename))
@ -857,7 +878,7 @@ See `helm-ff-serial-rename-1'."
:must-match t)))
done)
(with-helm-display-marked-candidates
helm-marked-buffer-name (mapcar 'helm-basename cands)
helm-marked-buffer-name (helm-ff--count-and-collect-dups cands)
(if (y-or-n-p
(format "Rename %s file(s) to <%s> like this ?\n%s "
(length cands) dir (format "%s <-> %s%s.%s"
@ -2602,12 +2623,11 @@ Find inside `require' and `declare-function' sexp."
when (eq (car (file-attributes cd)) t)
return cd)))
(defvar dired-async-mode)
(cl-defun helm-dired-action (candidate
&key action follow (files (dired-get-marked-files)))
"Execute ACTION on FILES to CANDIDATE.
Where ACTION is a symbol that can be one of:
'copy, 'rename, 'symlink,'relsymlink, 'hardlink.
'copy, 'rename, 'symlink,'relsymlink, 'hardlink or 'backup.
Argument FOLLOW when non--nil specify to follow FILES to destination for the actions
copy and rename."
(when (get-buffer dired-log-buffer) (kill-buffer dired-log-buffer))
@ -2621,12 +2641,13 @@ copy and rename."
(rename 'dired-rename-file)
(symlink 'make-symbolic-link)
(relsymlink 'dired-make-relative-symlink)
(hardlink 'dired-hardlink)))
(hardlink 'dired-hardlink)
(backup 'backup-file)))
(marker (cl-case action
((copy rename) dired-keep-marker-copy)
(symlink dired-keep-marker-symlink)
(relsymlink dired-keep-marker-relsymlink)
(hardlink dired-keep-marker-hardlink)))
((copy rename backup) dired-keep-marker-copy)
(symlink dired-keep-marker-symlink)
(relsymlink dired-keep-marker-relsymlink)
(hardlink dired-keep-marker-hardlink)))
(dirflag (and (= (length files) 1)
(file-directory-p (car files))
(not (file-directory-p candidate))))
@ -2754,11 +2775,7 @@ Ask to kill buffers associated with that file, too."
(len (length files)))
(with-helm-display-marked-candidates
helm-marked-buffer-name
(mapcar (lambda (f)
(if (file-directory-p f)
(concat (helm-basename f) "/")
(helm-basename f)))
files)
(helm-ff--count-and-collect-dups files)
(if (not (y-or-n-p (format "Delete *%s File(s)" len)))
(message "(No deletions performed)")
(cl-dolist (i files)

View File

@ -384,6 +384,11 @@ Shortcut for basename without extension, only extension or all are available:
- Only extension => \".%\"
- All => \"%\"
So in the example above you could do instead:
At first prompt enter \".%\", at second \"jpg\" and hit `RET`.
Note that when using this instead of using \"JPG\" at first prompt, all extensions
will be renamed to \"jpg\" even if the extension of one of the files is e.g \"png\".
If you want to rename a serie of files from number 001 to 00x use \\# inside the replacement
string when you will be prompted for it.
@ -397,8 +402,8 @@ Note: You can do this with the serial renames actions you will find in the actio
for more sophisticated renaming, but using query replace regexp on filenames
is a fast way for most common serial replacements.
Note also that unlike the serial renames action the renamed files stay in their initial directory
and are not renamed to current directory, IOW use this to rename files inside current directory.
Note also that unlike the serial rename actions the renamed files stay in their initial directory
and are not renamed to current directory, IOW use this (\\#) to rename files inside current directory.
In the second prompt (replace regexp with) shortcut for `upcase', `downcase' and `capitalize'
are available, respectively `%u', `%d' and `%c'.

View File

@ -1,4 +1,4 @@
(define-package "helm" "20160421.621" "Helm is an Emacs incremental and narrowing framework"
(define-package "helm" "20160425.958" "Helm is an Emacs incremental and narrowing framework"
'((emacs "24.3")
(async "1.7")
(popup "0.5.3")

View File

@ -3,8 +3,7 @@
;;; Code:
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
;;;### (autoloads nil "helm-ag" "helm-ag.el" (22297 53346 754924
;;;;;; 211000))
;;;### (autoloads nil "helm-ag" "helm-ag.el" (22303 19283 86176 785000))
;;; Generated autoloads from helm-ag.el
(autoload 'helm-ag-pop-stack "helm-ag" "\

View File

@ -1 +1 @@
(define-package "helm-ag" "20160411.417" "the silver searcher with helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-ag")
(define-package "helm-ag" "20160424.546" "the silver searcher with helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-ag")

View File

@ -4,7 +4,7 @@
;; Author: Syohei YOSHIDA <syohex@gmail.com>
;; URL: https://github.com/syohex/emacs-helm-ag
;; Package-Version: 20160411.417
;; Package-Version: 20160424.546
;; Version: 0.53
;; Package-Requires: ((emacs "24.3") (helm "1.7.7"))
@ -288,7 +288,10 @@ Default behaviour shows finish and result in mode-line."
(funcall find-func filename)
(goto-char (point-min))
(when line
(forward-line (1- (string-to-number line))))))
(forward-line (1- (string-to-number line))))
(ignore-errors
(and (re-search-forward helm-ag--last-query (line-end-position) t)
(goto-char (match-beginning 0))))))
(defun helm-ag--open-file-with-temp-buffer (filename)
(switch-to-buffer (get-buffer-create " *helm-ag persistent*"))

View File

@ -1,166 +0,0 @@
This is magit.info, produced by makeinfo version 5.2 from magit.texi.
Magit is an interface to the version control system Git, implemented as
an Emacs package. Magit aspires to be a complete Git porcelain. While
we cannot (yet) claim that Magit wraps and improves upon each and every
Git command, it is complete enough to allow even experienced Git users
to perform almost all of their daily version control tasks directly from
within Emacs. While many fine Git clients exist, only Magit and Git
itself deserve to be called porcelains.
Copyright (C) 2015-2016 Jonas Bernoulli <jonas@bernoul.li>
You can redistribute this document and/or modify it under the terms
of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option)
any later version.
This document is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
INFO-DIR-SECTION Emacs
START-INFO-DIR-ENTRY
* Magit: (magit). Using Git from Emacs with Magit.
END-INFO-DIR-ENTRY

Indirect:
magit.info-1: 1222
magit.info-2: 321654

Tag Table:
(Indirect)
Node: Top1222
Node: Introduction6032
Node: Installation10725
Node: Updating from an older release11100
Node: Installing from an Elpa archive12695
Node: Installing from the Git repository14034
Node: Post-installation tasks16830
Node: Getting started18219
Node: Interface concepts23954
Node: Modes and Buffers24228
Node: Switching Buffers25974
Node: Naming Buffers29038
Node: Quitting Windows31873
Node: Automatic Refreshing of Magit Buffers33505
Node: Automatic Saving of File-Visiting Buffers36273
Node: Automatic Reverting of File-Visiting Buffers37458
Node: Risk of Reverting Automatically42454
Node: Sections44837
Node: Section movement45778
Node: Section visibility49705
Node: Section hooks53296
Node: Section types and values55577
Node: Section options56847
Node: Popup buffers and prefix commands57319
Node: Completion and confirmation58633
Node: Running Git61539
Node: Viewing Git output61775
Node: Running Git manually62775
Node: Git executable64901
Node: Global Git arguments66908
Node: Inspecting67715
Node: Status buffer68842
Node: Status sections71365
Node: Status header sections76612
Node: Status options79171
Node: Logging79895
Node: Refreshing logs82424
Node: Log Buffer83809
Node: Select from log86898
Node: Reflog87838
Node: Diffing88316
Node: Refreshing diffs91128
Node: Diff buffer94109
Node: Diff options96011
Node: Revision buffer97767
Node: Ediffing98722
Node: References buffer102180
Node: References sections106890
Node: Bisecting107765
Node: Visiting blobs109261
Node: Blaming109770
Node: Manipulating113090
Node: Repository setup113382
Node: Staging and unstaging114422
Node: Staging from file-visiting buffers118317
Node: Applying119485
Node: Committing121128
Node: Initiating a commit121711
Node: Editing commit messages125023
Node: Branching135419
Node: Merging148233
Node: Rebasing150317
Node: Editing rebase sequences153265
Node: Rebase sequence log156299
Node: Cherry picking163043
Node: Reverting164649
Node: Resetting166012
Node: Stashing167522
Node: Transferring170696
Node: Remotes170934
Node: Fetching172220
Node: Pulling173586
Node: Pushing174432
Node: Creating and sending patches179176
Node: Applying patches179871
Node: Miscellaneous180869
Node: Tagging181160
Node: Notes181945
Node: Submodules184470
Node: Common commands185790
Node: Wip modes187538
Node: Minor mode for buffers visiting files194274
Node: Minor mode for buffers visiting blobs196768
Node: Customizing197573
Node: Per-repository configuration199245
Node: Essential settings200879
Node: Safety201203
Node: Performance203036
Node: Committing Performance209709
Node: Plumbing210690
Node: Calling Git211318
Node: Getting a value from Git212841
Node: Calling Git for effect215945
Node: Section plumbing222449
Node: Creating sections222677
Node: Section selection226576
Node: Matching sections228256
Node: Refreshing buffers233458
Node: Conventions236593
Node: Confirmation and completion236770
Node: Theming Faces237668
Node: FAQ245819
Node: Magit is slow247230
Node: I changed several thousand files at once and now Magit is unusable247431
Node: I am having problems committing248147
Node: Diffs are collapsed after un-/staging248593
Node: I don't understand how branching and pushing work249864
Node: I don't like the key binding in v24250239
Node: I cannot install the pre-requisites for Magit v2250578
Node: I am using an Emacs release older than v244251043
Node: I am using a Git release older than v194252656
Node: I am using MS Windows and cannot push with Magit253643
Node: How to install the gitman info manual?254224
Node: How can I show Git's output?256752
Node: Diffs contain control sequences257539
Node: Expanding a file to show the diff causes it to disappear258544
Node: Point is wrong in the COMMIT_EDITMSG buffer259073
Node: Can Magit be used as ediff-version-control-package?260091
Node: How to show diffs for gpg-encrypted files?262115
Node: Emacs 245 hangs when loading Magit262706
Node: Symbol's value as function is void --some263275
Node: Where is the branch manager263595
Node: Keystroke Index263880
Node: Command Index291671
Node: Function Index321654
Node: Variable Index333777

End Tag Table

Local Variables:
coding: utf-8
End:

View File

@ -5,7 +5,7 @@ The following people have contributed to Magit, including the
libraries `git-commit.el`, `magit-popup.el`, and `with-editor.el`
which are distributed as separate Elpa packages.
For statistics see http://magit.vc/stats/authors.html.
For statistics see https://magit.vc/stats/authors.html.
Names below are sorted alphabetically.

View File

@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22297 19813 681145
;;;;;; 600000))
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22303 19282 518177
;;;;;; 224000))
;;; Generated autoloads from git-rebase.el
(autoload 'git-rebase-mode "git-rebase" "\
@ -23,7 +23,7 @@ running 'man git-rebase' at the command line) for details.
;;;***
;;;### (autoloads nil "magit" "magit.el" (22297 19815 953104 965000))
;;;### (autoloads nil "magit" "magit.el" (22303 19282 578177 178000))
;;; Generated autoloads from magit.el
(autoload 'magit-status "magit" "\
@ -398,6 +398,7 @@ defaulting to the tag at point.
\(fn TAGS)" t nil)
(autoload 'magit-notes-popup "magit" nil t)
(autoload 'magit-file-popup "magit" nil t)
(defvar global-magit-file-mode nil "\
Non-nil if Global-Magit-File mode is enabled.
@ -457,8 +458,8 @@ Git, and Emacs in the echo area.
;;;***
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22297 19814
;;;;;; 251135 404000))
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22303 19282
;;;;;; 530177 215000))
;;; Generated autoloads from magit-apply.el
(autoload 'magit-stage-file "magit-apply" "\
@ -494,8 +495,8 @@ Remove all changes from the staging area.
;;;***
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22297
;;;;;; 19812 575165 378000))
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22303
;;;;;; 19282 474177 259000))
;;; Generated autoloads from magit-autorevert.el
(defvar magit-revert-buffers t)
@ -523,8 +524,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
;;;***
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22297 19814
;;;;;; 112137 891000))
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22303 19282
;;;;;; 526177 218000))
;;; Generated autoloads from magit-bisect.el
(autoload 'magit-bisect-popup "magit-bisect" nil t)
@ -575,8 +576,8 @@ bisect run'.
;;;***
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22297 19815
;;;;;; 594111 386000))
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22303 19282
;;;;;; 566177 187000))
;;; Generated autoloads from magit-blame.el
(autoload 'magit-blame-popup "magit-blame" nil t)
@ -600,8 +601,8 @@ only arguments available from `magit-blame-popup' should be used.
;;;***
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22297 19812
;;;;;; 710162 964000))
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22303 19282
;;;;;; 482177 252000))
;;; Generated autoloads from magit-commit.el
(autoload 'magit-commit "magit-commit" "\
@ -683,8 +684,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
;;;***
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22297 19815 500113
;;;;;; 67000))
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22303 19282 562177
;;;;;; 190000))
;;; Generated autoloads from magit-diff.el
(autoload 'magit-diff-dwim "magit-diff" "\
@ -749,8 +750,8 @@ for a revision.
;;;***
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22297 19815
;;;;;; 231117 878000))
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22303 19282
;;;;;; 554177 196000))
;;; Generated autoloads from magit-ediff.el
(autoload 'magit-ediff-popup "magit-ediff" nil t)
@ -838,8 +839,8 @@ stash that were staged.
;;;***
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22297 19812
;;;;;; 849160 478000))
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22303 19282
;;;;;; 490177 246000))
;;; Generated autoloads from magit-extras.el
(autoload 'magit-run-git-gui "magit-extras" "\
@ -909,8 +910,8 @@ on a position in a file-visiting buffer.
;;;***
;;;### (autoloads nil "magit-log" "magit-log.el" (22297 19815 391115
;;;;;; 16000))
;;;### (autoloads nil "magit-log" "magit-log.el" (22303 19282 558177
;;;;;; 193000))
;;; Generated autoloads from magit-log.el
(autoload 'magit-log-current "magit-log" "\
@ -978,8 +979,8 @@ Show commits in a branch that are not merged in the upstream branch.
;;;***
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22297 19816
;;;;;; 537094 521000))
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22303 19282
;;;;;; 594177 165000))
;;; Generated autoloads from magit-remote.el
(autoload 'magit-clone "magit-remote" "\
@ -1211,8 +1212,8 @@ is asked to pull. START has to be reachable from that commit.
;;;***
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22297
;;;;;; 19816 152101 407000))
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22303
;;;;;; 19282 586177 172000))
;;; Generated autoloads from magit-sequence.el
(autoload 'magit-sequencer-continue "magit-sequence" "\
@ -1360,8 +1361,8 @@ Abort the current rebase operation, restoring the original branch.
;;;***
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22297 19814
;;;;;; 722126 982000))
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22303 19282
;;;;;; 546177 202000))
;;; Generated autoloads from magit-stash.el
(autoload 'magit-stash-popup "magit-stash" nil t)
@ -1460,8 +1461,8 @@ Show all diffs of a stash in a buffer.
;;;***
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22297
;;;;;; 19817 180083 21000))
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22303
;;;;;; 19282 606177 156000))
;;; Generated autoloads from magit-submodule.el
(autoload 'magit-submodule-popup "magit-submodule" nil t)
@ -1470,7 +1471,7 @@ Add the repository at URL as a submodule.
Optional PATH is the path to the submodule relative to the root
of the superproject. If it is nil, then the path is determined
based on URL.
based on the URL.
Optional NAME is the name of the submodule. If it is nil, then
PATH also becomes the name.
@ -1509,6 +1510,12 @@ Unregister the submodule at PATH.
\(fn PATH)" t nil)
(autoload 'magit-insert-submodules "magit-submodule" "\
Insert sections for all modules.
For each section insert the path and the output of `git describe --tags'.
\(fn)" nil nil)
(autoload 'magit-insert-modules-unpulled-from-upstream "magit-submodule" "\
Insert sections for modules that haven't been pulled from the upstream.
These sections can be expanded to show the respective commits.
@ -1535,8 +1542,8 @@ These sections can be expanded to show the respective commits.
;;;***
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22297 19813 56156
;;;;;; 776000))
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22303 19282 502177
;;;;;; 236000))
;;; Generated autoloads from magit-wip.el
(defvar magit-wip-after-save-mode nil "\
@ -1603,7 +1610,7 @@ command which is about to be called are committed.
;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el"
;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el")
;;;;;; (22297 19818 84560 140000))
;;;;;; (22303 19282 617769 719000))
;;;***

View File

@ -1364,10 +1364,11 @@ ahead of the current branch, then show the commits that have
not yet been pulled into the current branch. If no upstream is
configured or if the upstream is not ahead of the current branch,
then show the last `magit-log-section-commit-count' commits."
(if (equal (magit-rev-parse "HEAD")
(magit-rev-parse "@{upstream}"))
(magit-insert-recent-commits t)
(magit-insert-unpulled-from-upstream)))
(let ((upstream (magit-rev-parse "@{upstream}")))
(if (or (not upstream)
(equal upstream (magit-rev-parse "HEAD")))
(magit-insert-recent-commits t)
(magit-insert-unpulled-from-upstream))))
;;;; Auxiliary Log Sections

View File

@ -1,10 +1,10 @@
(define-package "magit" "20160421.459" "A Git porcelain inside Emacs"
(define-package "magit" "20160425.430" "A Git porcelain inside Emacs"
'((emacs "24.4")
(async "20150909.2257")
(dash "20151021.113")
(with-editor "20160408.201")
(git-commit "20160412.130")
(magit-popup "20160408.156"))
(git-commit "20160414.251")
(magit-popup "20160414.251"))
:url "https://github.com/magit/magit" :keywords
'("git" "tools" "vc"))
;; Local Variables:

Some files were not shown because too many files have changed in this diff Show More