Update packages
This commit is contained in:
Gergely Polonkai
parent
d3a225a59e
commit
449ebf466d
@ -1,10 +1,10 @@
|
||||
;;; company-shell-autoloads.el --- automatically extracted autoloads
|
||||
;;
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "company-shell" "company-shell.el" (22387 29373
|
||||
;;;;;; 371978 851000))
|
||||
;;;### (autoloads nil "company-shell" "company-shell.el" (22514 17686
|
||||
;;;;;; 400754 769000))
|
||||
;;; Generated autoloads from company-shell.el
|
||||
|
||||
(autoload 'company-shell-rebuild-cache "company-shell" "\
|
||||
@ -1 +1,2 @@
|
||||
(define-package "company-shell" "20160528.507" "Company mode backend for shell functions" '((company "0.8.12") (dash "2.12.0") (cl-lib "0.5")) :url "https://github.com/Alexander-Miller/company-shell" :keywords '("company" "shell"))
|
||||
;;; -*- no-byte-compile: t -*-
|
||||
(define-package "company-shell" "20161002.505" "Company mode backend for shell functions" '((company "0.8.12") (dash "2.12.0") (cl-lib "0.5")) :url "https://github.com/Alexander-Miller/company-shell" :keywords '("company" "shell"))
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: Alexander Miller <alexanderm@web.de>
|
||||
;; Package-Requires: ((company "0.8.12") (dash "2.12.0") (cl-lib "0.5"))
|
||||
;; Package-Version: 20160528.507
|
||||
;; Package-Version: 20161002.505
|
||||
;; Homepage: https://github.com/Alexander-Miller/company-shell
|
||||
;; Version: 1.0
|
||||
;; Keywords: company, shell
|
||||
@ -133,9 +133,9 @@ it in the understanding that you do this AT YOUR OWN RISK.")
|
||||
(-some-> (format "whatis %s" arg)
|
||||
(shell-command-to-string)
|
||||
(split-string "\n")
|
||||
(first)
|
||||
(cl-first)
|
||||
(split-string " - ")
|
||||
(second)))
|
||||
(cl-second)))
|
||||
|
||||
;;;###autoload
|
||||
(defun company-shell-rebuild-cache ()
|
||||
@ -3,8 +3,8 @@
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "flycheck" "flycheck.el" (22508 49902 949975
|
||||
;;;;;; 140000))
|
||||
;;;### (autoloads nil "flycheck" "flycheck.el" (22514 17685 56751
|
||||
;;;;;; 684000))
|
||||
;;; Generated autoloads from flycheck.el
|
||||
|
||||
(autoload 'flycheck-manual "flycheck" "\
|
||||
@ -228,7 +228,7 @@ Use this together with the `option', `option-list' and
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil nil ("flycheck-buttercup.el" "flycheck-ert.el"
|
||||
;;;;;; "flycheck-pkg.el") (22508 49902 945975 131000))
|
||||
;;;;;; "flycheck-pkg.el") (22514 17685 48751 666000))
|
||||
|
||||
;;;***
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
(define-package "flycheck" "20160928.649" "On-the-fly syntax checking"
|
||||
(define-package "flycheck" "20160930.944" "On-the-fly syntax checking"
|
||||
'((dash "2.12.1")
|
||||
(pkg-info "0.4")
|
||||
(let-alist "1.0.4")
|
||||
@ -1748,23 +1748,23 @@ Signal an error, if any property has an invalid value."
|
||||
(flycheck-validate-next-checker checker))
|
||||
|
||||
(let ((real-predicate
|
||||
(lambda ()
|
||||
(if (flycheck-valid-checker-p symbol)
|
||||
(or (null predicate)
|
||||
;; Run predicate in the checker's default directory
|
||||
(let ((default-directory
|
||||
(flycheck-compute-working-directory symbol)))
|
||||
(funcall predicate)))
|
||||
(lwarn 'flycheck :warning "%S is no valid Flycheck syntax checker.
|
||||
Try to reinstall the package defining this syntax checker." symbol)
|
||||
nil)))
|
||||
(and predicate
|
||||
(lambda ()
|
||||
;; Run predicate in the checker's default directory
|
||||
(let ((default-directory
|
||||
(flycheck-compute-working-directory symbol)))
|
||||
(funcall predicate)))))
|
||||
(real-enabled
|
||||
(lambda ()
|
||||
(or (null enabled)
|
||||
;; Run enabled in the checker's default directory
|
||||
(let ((default-directory
|
||||
(flycheck-compute-working-directory symbol)))
|
||||
(funcall enabled))))))
|
||||
(if (flycheck-valid-checker-p symbol)
|
||||
(or (null enabled)
|
||||
;; Run enabled in the checker's default directory
|
||||
(let ((default-directory
|
||||
(flycheck-compute-working-directory symbol)))
|
||||
(funcall enabled)))
|
||||
(lwarn 'flycheck :warning "%S is no valid Flycheck syntax checker.
|
||||
Try to reinstall the package defining this syntax checker." symbol)
|
||||
nil))))
|
||||
(pcase-dolist (`(,prop . ,value)
|
||||
`((start . ,start)
|
||||
(interrupt . ,interrupt)
|
||||
@ -1833,7 +1833,7 @@ nil otherwise."
|
||||
(and (flycheck-valid-checker-p checker)
|
||||
(flycheck-checker-supports-major-mode-p checker major-mode)
|
||||
(flycheck-may-enable-checker checker)
|
||||
(funcall predicate))))
|
||||
(or (null predicate) (funcall predicate)))))
|
||||
|
||||
(defun flycheck-may-use-next-checker (next-checker)
|
||||
"Determine whether NEXT-CHECKER may be used."
|
||||
@ -1986,7 +1986,15 @@ Slots:
|
||||
Return a list of `flycheck-verification-result' objects."
|
||||
(let (results
|
||||
(predicate (flycheck-checker-get checker 'predicate))
|
||||
(enabled (flycheck-checker-get checker 'enabled))
|
||||
(verify (flycheck-checker-get checker 'verify)))
|
||||
(when enabled
|
||||
(let ((result (funcall enabled)))
|
||||
(push (flycheck-verification-result-new
|
||||
:label "may enable"
|
||||
:message (if result "yes" "Automatically disabled!")
|
||||
:face (if result 'success '(bold warning)))
|
||||
results)))
|
||||
(when predicate
|
||||
(let ((result (funcall predicate)))
|
||||
(push (flycheck-verification-result-new
|
||||
@ -7507,6 +7515,13 @@ for more information about the custom directories."
|
||||
:safe #'flycheck-string-list-p
|
||||
:package-version '(flycheck . "29"))
|
||||
|
||||
(defun flycheck-eslint-config-exists-p ()
|
||||
"Whether there is an eslint config for the current buffer."
|
||||
(let* ((executable (flycheck-find-checker-executable 'javascript-eslint))
|
||||
(exitcode (and executable (call-process executable nil nil nil
|
||||
"--print-config" "."))))
|
||||
(eq exitcode 0)))
|
||||
|
||||
(flycheck-define-checker javascript-eslint
|
||||
"A Javascript syntax and style checker using eslint.
|
||||
|
||||
@ -7532,14 +7547,19 @@ See URL `https://github.com/eslint/eslint'."
|
||||
(flycheck-error-message err))))
|
||||
(flycheck-sanitize-errors errors))
|
||||
errors)
|
||||
:enabled
|
||||
(lambda ()
|
||||
(let* ((executable (flycheck-find-checker-executable 'javascript-eslint))
|
||||
(exitcode (call-process executable nil nil nil
|
||||
"--print-config" ".")))
|
||||
(eq exitcode 0)))
|
||||
:enabled (lambda () (flycheck-eslint-config-exists-p))
|
||||
:modes (js-mode js-jsx-mode js2-mode js2-jsx-mode js3-mode)
|
||||
:next-checkers ((warning . javascript-jscs)))
|
||||
:next-checkers ((warning . javascript-jscs))
|
||||
:verify
|
||||
(lambda (_)
|
||||
(let* ((default-directory
|
||||
(flycheck-compute-working-directory 'javascript-eslint))
|
||||
(have-config (flycheck-eslint-config-exists-p)))
|
||||
(list
|
||||
(flycheck-verification-result-new
|
||||
:label "config file"
|
||||
:message (if have-config "found" "missing")
|
||||
:face (if have-config 'success '(bold error)))))))
|
||||
|
||||
(flycheck-def-config-file-var flycheck-gjslintrc javascript-gjslint ".gjslintrc"
|
||||
:safe #'stringp)
|
||||
@ -1 +0,0 @@
|
||||
(define-package "ggtags" "20160909.813" "emacs frontend to GNU Global source code tagging system" '((emacs "24") (cl-lib "0.5")) :url "https://github.com/leoliu/ggtags" :keywords '("tools" "convenience"))
|
||||
@ -1,9 +1,9 @@
|
||||
;;; ggtags-autoloads.el --- automatically extracted autoloads
|
||||
;;
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "ggtags" "ggtags.el" (22490 24937 307403 1000))
|
||||
;;;### (autoloads nil "ggtags" "ggtags.el" (22514 17682 180745 86000))
|
||||
;;; Generated autoloads from ggtags.el
|
||||
|
||||
(autoload 'ggtags-find-project "ggtags" "\
|
||||
2
elpa/ggtags-20161001.1836/ggtags-pkg.el
Normal file
2
elpa/ggtags-20161001.1836/ggtags-pkg.el
Normal file
@ -0,0 +1,2 @@
|
||||
;;; -*- no-byte-compile: t -*-
|
||||
(define-package "ggtags" "20161001.1836" "emacs frontend to GNU Global source code tagging system" '((emacs "24") (cl-lib "0.5")) :url "https://github.com/leoliu/ggtags" :keywords '("tools" "convenience"))
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: Leo Liu <sdl.web@gmail.com>
|
||||
;; Version: 0.8.12
|
||||
;; Package-Version: 20160909.813
|
||||
;; Package-Version: 20161001.1836
|
||||
;; Keywords: tools, convenience
|
||||
;; Created: 2013-01-29
|
||||
;; URL: https://github.com/leoliu/ggtags
|
||||
@ -31,17 +31,21 @@
|
||||
;; Usage:
|
||||
;;
|
||||
;; `ggtags' is similar to the standard `etags' package. These keys
|
||||
;; `M-.', `M-,', `M-*' and `C-M-.' should work as expected in
|
||||
;; `ggtags-mode'. See the README in https://github.com/leoliu/ggtags
|
||||
;; for more details.
|
||||
;; `M-.', `M-,' and `C-M-.' should work as expected in `ggtags-mode'.
|
||||
;; See the README in https://github.com/leoliu/ggtags for more
|
||||
;; details.
|
||||
;;
|
||||
;; All commands are available from the `Ggtags' menu in `ggtags-mode'.
|
||||
|
||||
;;; NEWS 0.8.11 (2015-12-15):
|
||||
;;; NEWS 0.8.12 (2016-10-02):
|
||||
|
||||
;; - `ggtags-highlight-tag-delay' is renamed to `ggtags-highlight-tag'
|
||||
;; - Tag highlighting can be disabled by setting
|
||||
;; `ggtags-highlight-tag' to nil.
|
||||
;; - Work with Emacs 25
|
||||
;; - `ggtags-navigation-mode' is more discreet in displaying lighter
|
||||
;; when `ggtags-enable-navigation-keys' is set to nil
|
||||
;; - `ggtags-make-project' tries harder to find TAG files respecting
|
||||
;; `GTAGSDBPATH'
|
||||
;; - Fix error "Selecting deleted buffer"
|
||||
;; https://github.com/leoliu/ggtags/issues/89
|
||||
;;
|
||||
;; See full NEWS on https://github.com/leoliu/ggtags#news
|
||||
|
||||
@ -92,7 +96,14 @@
|
||||
(or (fboundp 'read-only-mode) ;24.3
|
||||
(defalias 'read-only-mode 'toggle-read-only))
|
||||
(or (fboundp 'register-read-with-preview) ;24.4
|
||||
(defalias 'register-read-with-preview 'read-char)))
|
||||
(defalias 'register-read-with-preview 'read-char))
|
||||
(or (boundp 'xref--marker-ring) ;25.1
|
||||
(defvaralias 'xref--marker-ring 'find-tag-marker-ring))
|
||||
(or (fboundp 'xref-push-marker-stack) ;25.1
|
||||
(defun xref-push-marker-stack (&optional m)
|
||||
(ring-insert xref--marker-ring (or m (point-marker)))))
|
||||
(or (fboundp 'xref-pop-marker-stack)
|
||||
(defalias 'xref-pop-marker-stack 'pop-tag-mark)))
|
||||
|
||||
(defgroup ggtags nil
|
||||
"GNU Global source code tagging system."
|
||||
@ -335,7 +346,7 @@ Nil means using the value of `completing-read-function'."
|
||||
|
||||
(defcustom ggtags-highlight-tag 0.25
|
||||
"If non-nil time in seconds before highlighting tag at point.
|
||||
Set to `nil' to disable tag highlighting."
|
||||
Set to nil to disable tag highlighting."
|
||||
:set (lambda (sym value)
|
||||
(when (fboundp 'ggtags-setup-highlight-tag-at-point)
|
||||
(ggtags-setup-highlight-tag-at-point value))
|
||||
@ -929,7 +940,7 @@ blocking emacs."
|
||||
(defun ggtags-global-save-start-marker ()
|
||||
(when (markerp ggtags-global-start-marker)
|
||||
(setq ggtags-tag-ring-index nil)
|
||||
(ring-insert find-tag-marker-ring ggtags-global-start-marker)
|
||||
(xref-push-marker-stack ggtags-global-start-marker)
|
||||
(setq ggtags-global-start-marker t)))
|
||||
|
||||
(defun ggtags-global-start (command &optional directory)
|
||||
@ -1367,17 +1378,16 @@ Use \\[jump-to-register] to restore the search session."
|
||||
(defun ggtags-next-mark (&optional arg)
|
||||
"Move to the next (newer) mark in the tag marker ring."
|
||||
(interactive)
|
||||
(and (ring-empty-p find-tag-marker-ring) (user-error "Tag ring empty"))
|
||||
(and (ring-empty-p xref--marker-ring) (user-error "Tag ring empty"))
|
||||
(setq ggtags-tag-ring-index
|
||||
;; Note `ring-minus1' gets newer item.
|
||||
(funcall (if arg #'ring-plus1 #'ring-minus1)
|
||||
(or ggtags-tag-ring-index
|
||||
(progn
|
||||
(ring-insert find-tag-marker-ring (point-marker))
|
||||
0))
|
||||
(ring-length find-tag-marker-ring)))
|
||||
(let ((m (ring-ref find-tag-marker-ring ggtags-tag-ring-index))
|
||||
(i (- (ring-length find-tag-marker-ring) ggtags-tag-ring-index)))
|
||||
(progn (xref-push-marker-stack)
|
||||
0))
|
||||
(ring-length xref--marker-ring)))
|
||||
(let ((m (ring-ref xref--marker-ring ggtags-tag-ring-index))
|
||||
(i (- (ring-length xref--marker-ring) ggtags-tag-ring-index)))
|
||||
(ggtags-echo "%d%s marker%s" i (pcase (mod i 10)
|
||||
;; ` required for 24.1 and 24.2
|
||||
(`1 "st")
|
||||
@ -1412,7 +1422,7 @@ commands `next-error' and `previous-error'.
|
||||
|
||||
\\{ggtags-view-tag-history-mode-map}"
|
||||
(interactive)
|
||||
(and (ring-empty-p find-tag-marker-ring)
|
||||
(and (ring-empty-p xref--marker-ring)
|
||||
(user-error "Tag ring empty"))
|
||||
(let ((split-window-preferred-function ggtags-split-window-function)
|
||||
(inhibit-read-only t))
|
||||
@ -1424,8 +1434,8 @@ commands `next-error' and `previous-error'.
|
||||
(setq tabulated-list-entries
|
||||
;; Use a function so that revert can work properly.
|
||||
(lambda ()
|
||||
(let ((counter (ring-length find-tag-marker-ring))
|
||||
(elements (or (ring-elements find-tag-marker-ring)
|
||||
(let ((counter (ring-length xref--marker-ring))
|
||||
(elements (or (ring-elements xref--marker-ring)
|
||||
(user-error "Tag ring empty")))
|
||||
(action (lambda (_button) (next-error 0)))
|
||||
(get-line (lambda (m)
|
||||
@ -1682,11 +1692,18 @@ ggtags: history match invalid, jump to first match instead")
|
||||
'compilation-message)))
|
||||
;; There are multiple matches so pop up the buffer.
|
||||
(and ggtags-navigation-mode (ggtags-global--display-buffer))
|
||||
;; For the `compilation-auto-jump' in idle timer to run.
|
||||
;; See also: http://debbugs.gnu.org/13829
|
||||
(sit-for 0)
|
||||
;; Manually run the `compilation-auto-jump' timer. Hackish but
|
||||
;; everything else seems unreliable. See:
|
||||
;;
|
||||
;; - http://debbugs.gnu.org/13829
|
||||
;; - http://debbugs.gnu.org/23987
|
||||
;; - https://github.com/leoliu/ggtags/issues/89
|
||||
;;
|
||||
(pcase (cl-find 'compilation-auto-jump timer-list :key #'timer--function)
|
||||
(`nil )
|
||||
(timer (timer-event-handler timer)))
|
||||
(ggtags-navigation-mode -1)
|
||||
(ggtags-navigation-mode-cleanup buf 0)))))
|
||||
(ggtags-navigation-mode-cleanup buf t)))))
|
||||
|
||||
(defvar ggtags-global-mode-font-lock-keywords
|
||||
'(("^Global \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*"
|
||||
@ -1754,7 +1771,8 @@ ggtags: history match invalid, jump to first match instead")
|
||||
(define-key map "\M-o" 'ggtags-navigation-visible-mode)
|
||||
(define-key map [return] 'ggtags-navigation-mode-done)
|
||||
(define-key map "\r" 'ggtags-navigation-mode-done)
|
||||
(define-key map [remap pop-tag-mark] 'ggtags-navigation-mode-abort)
|
||||
(define-key map [remap pop-tag-mark] 'ggtags-navigation-mode-abort) ;Emacs 24
|
||||
(define-key map [remap xref-pop-marker-stack] 'ggtags-navigation-mode-abort)
|
||||
map))
|
||||
|
||||
(defvar ggtags-mode-map-alist
|
||||
@ -1809,7 +1827,7 @@ ggtags: history match invalid, jump to first match instead")
|
||||
(goto-char (match-beginning 0))
|
||||
(goto-char orig))))))
|
||||
|
||||
(defun ggtags-navigation-mode-cleanup (&optional buf time)
|
||||
(defun ggtags-navigation-mode-cleanup (&optional buf kill)
|
||||
(let ((buf (or buf ggtags-global-last-buffer)))
|
||||
(and (buffer-live-p buf)
|
||||
(with-current-buffer buf
|
||||
@ -1818,7 +1836,7 @@ ggtags: history match invalid, jump to first match instead")
|
||||
(when (and (derived-mode-p 'ggtags-global-mode)
|
||||
(get-buffer-window))
|
||||
(quit-windows-on (current-buffer)))
|
||||
(and time (run-with-idle-timer time nil #'kill-buffer buf))))))
|
||||
(and kill (kill-buffer buf))))))
|
||||
|
||||
(defun ggtags-navigation-mode-done ()
|
||||
(interactive)
|
||||
@ -1831,13 +1849,13 @@ ggtags: history match invalid, jump to first match instead")
|
||||
"Abort navigation and return to where the search was started."
|
||||
(interactive)
|
||||
(ggtags-navigation-mode -1)
|
||||
(ggtags-navigation-mode-cleanup nil 0)
|
||||
(ggtags-navigation-mode-cleanup nil t)
|
||||
;; Run after (ggtags-navigation-mode -1) or
|
||||
;; ggtags-global-start-marker might not have been saved.
|
||||
(when (and ggtags-global-start-marker
|
||||
(not (markerp ggtags-global-start-marker)))
|
||||
(setq ggtags-global-start-marker nil)
|
||||
(pop-tag-mark)))
|
||||
(xref-pop-marker-stack)))
|
||||
|
||||
(defun ggtags-navigation-next-file (n)
|
||||
(interactive "p")
|
||||
@ -2146,7 +2164,7 @@ When finished invoke CALLBACK in BUFFER with process exit status."
|
||||
(define-key menu [view-tag]
|
||||
'(menu-item "View tag history" ggtags-view-tag-history))
|
||||
(define-key menu [pop-mark]
|
||||
'(menu-item "Pop mark" pop-tag-mark
|
||||
'(menu-item "Pop mark" xref-pop-marker-stack
|
||||
:help "Pop to previous mark and destroy it"))
|
||||
(define-key menu [next-mark]
|
||||
'(menu-item "Next mark" ggtags-next-mark))
|
||||
@ -2178,6 +2196,8 @@ When finished invoke CALLBACK in BUFFER with process exit status."
|
||||
'(menu-item "Show definition" ggtags-show-definition))
|
||||
(define-key menu [find-reference]
|
||||
'(menu-item "Find reference" ggtags-find-reference))
|
||||
;; TODO: bind `find-tag-continue' to `M-*' after dropping support
|
||||
;; for emacs < 25.
|
||||
(define-key menu [find-tag-continue]
|
||||
'(menu-item "Continue find tag" tags-loop-continue))
|
||||
(define-key menu [find-tag]
|
||||
@ -1 +0,0 @@
|
||||
(define-package "git-commit" "20160920.1452" "Edit Git commit messages" '((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
|
||||
@ -1,15 +1,16 @@
|
||||
;;; git-commit-autoloads.el --- automatically extracted autoloads
|
||||
;;
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "git-commit" "git-commit.el" (22499 37044 186000
|
||||
;;;;;; 0))
|
||||
;;;### (autoloads nil "git-commit" "git-commit.el" (22514 17681 480743
|
||||
;;;;;; 481000))
|
||||
;;; Generated autoloads from git-commit.el
|
||||
|
||||
(defvar global-git-commit-mode t "\
|
||||
Non-nil if Global-Git-Commit mode is enabled.
|
||||
See the command `global-git-commit-mode' for a description of this minor mode.
|
||||
Non-nil if Global Git-Commit mode is enabled.
|
||||
See the `global-git-commit-mode' command
|
||||
for a description of this minor mode.
|
||||
Setting this variable directly does not take effect;
|
||||
either customize it (see the info node `Easy Customization')
|
||||
or call the function `global-git-commit-mode'.")
|
||||
2
elpa/git-commit-20160929.801/git-commit-pkg.el
Normal file
2
elpa/git-commit-20160929.801/git-commit-pkg.el
Normal file
@ -0,0 +1,2 @@
|
||||
;;; -*- no-byte-compile: t -*-
|
||||
(define-package "git-commit" "20160929.801" "Edit Git commit messages" '((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
|
||||
@ -12,7 +12,7 @@
|
||||
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
|
||||
|
||||
;; Package-Requires: ((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457"))
|
||||
;; Package-Version: 20160920.1452
|
||||
;; Package-Version: 20160929.801
|
||||
;; Keywords: git tools vc
|
||||
;; Homepage: https://github.com/magit/magit
|
||||
|
||||
@ -346,6 +346,8 @@ usually honor this wish and return non-nil."
|
||||
(eval-after-load 'recentf
|
||||
'(add-to-list 'recentf-exclude git-commit-filename-regexp))
|
||||
|
||||
(add-to-list 'with-editor-file-name-history-exclude git-commit-filename-regexp)
|
||||
|
||||
(defun git-commit-setup-font-lock-in-buffer ()
|
||||
(and buffer-file-name
|
||||
(string-match-p git-commit-filename-regexp buffer-file-name)
|
||||
@ -3,8 +3,8 @@
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22508 49901
|
||||
;;;;;; 817972 734000))
|
||||
;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22514 17679
|
||||
;;;;;; 860739 765000))
|
||||
;;; Generated autoloads from helm-adaptive.el
|
||||
|
||||
(defvar helm-adaptive-mode nil "\
|
||||
@ -30,8 +30,8 @@ Useful when you have a old or corrupted `helm-adaptive-history-file'.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-apt" "helm-apt.el" (22508 49901 785972
|
||||
;;;;;; 666000))
|
||||
;;;### (autoloads nil "helm-apt" "helm-apt.el" (22514 17679 824739
|
||||
;;;;;; 683000))
|
||||
;;; Generated autoloads from helm-apt.el
|
||||
|
||||
(autoload 'helm-apt "helm-apt" "\
|
||||
@ -42,8 +42,8 @@ With a prefix arg reload cache.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22508 49901
|
||||
;;;;;; 881972 872000))
|
||||
;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22514 17679
|
||||
;;;;;; 924739 912000))
|
||||
;;; Generated autoloads from helm-bookmark.el
|
||||
|
||||
(autoload 'helm-bookmarks "helm-bookmark" "\
|
||||
@ -60,8 +60,8 @@ only if external library addressbook-bookmark.el is available.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22508 49901
|
||||
;;;;;; 769972 632000))
|
||||
;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22514 17679
|
||||
;;;;;; 816739 664000))
|
||||
;;; Generated autoloads from helm-buffers.el
|
||||
|
||||
(autoload 'helm-buffers-list "helm-buffers" "\
|
||||
@ -76,8 +76,8 @@ Preconfigured `helm' lightweight version (buffer -> recentf).
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-color" "helm-color.el" (22508 49901 853972
|
||||
;;;;;; 812000))
|
||||
;;;### (autoloads nil "helm-color" "helm-color.el" (22514 17679 908739
|
||||
;;;;;; 875000))
|
||||
;;; Generated autoloads from helm-color.el
|
||||
|
||||
(autoload 'helm-colors "helm-color" "\
|
||||
@ -87,8 +87,8 @@ Preconfigured `helm' for color.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-command" "helm-command.el" (22508 49901
|
||||
;;;;;; 725972 538000))
|
||||
;;;### (autoloads nil "helm-command" "helm-command.el" (22514 17679
|
||||
;;;;;; 768739 554000))
|
||||
;;; Generated autoloads from helm-command.el
|
||||
|
||||
(autoload 'helm-M-x "helm-command" "\
|
||||
@ -106,8 +106,8 @@ You can get help on each command by persistent action.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-config" "helm-config.el" (22508 49901
|
||||
;;;;;; 869972 846000))
|
||||
;;;### (autoloads nil "helm-config" "helm-config.el" (22514 17679
|
||||
;;;;;; 916739 894000))
|
||||
;;; Generated autoloads from helm-config.el
|
||||
|
||||
(autoload 'helm-configuration "helm-config" "\
|
||||
@ -117,8 +117,8 @@ Customize `helm'.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22508 49901
|
||||
;;;;;; 793972 683000))
|
||||
;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22514 17679
|
||||
;;;;;; 832739 701000))
|
||||
;;; Generated autoloads from helm-dabbrev.el
|
||||
|
||||
(autoload 'helm-dabbrev "helm-dabbrev" "\
|
||||
@ -128,8 +128,8 @@ Preconfigured helm for dynamic abbreviations.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22508 49901 861972
|
||||
;;;;;; 828000))
|
||||
;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22514 17679 912739
|
||||
;;;;;; 884000))
|
||||
;;; Generated autoloads from helm-elisp.el
|
||||
|
||||
(autoload 'helm-lisp-completion-at-point "helm-elisp" "\
|
||||
@ -183,7 +183,7 @@ Preconfigured helm for complex command history.
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el"
|
||||
;;;;;; (22508 49901 729972 547000))
|
||||
;;;;;; (22514 17679 776739 573000))
|
||||
;;; Generated autoloads from helm-elisp-package.el
|
||||
|
||||
(autoload 'helm-list-elisp-packages "helm-elisp-package" "\
|
||||
@ -199,8 +199,8 @@ Same as `helm-list-elisp-packages' but don't fetch packages on remote.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22508 49901
|
||||
;;;;;; 713972 512000))
|
||||
;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22514 17679
|
||||
;;;;;; 760739 536000))
|
||||
;;; Generated autoloads from helm-elscreen.el
|
||||
|
||||
(autoload 'helm-elscreen "helm-elscreen" "\
|
||||
@ -215,8 +215,8 @@ Preconfigured helm to list elscreen in history order.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22508 49901
|
||||
;;;;;; 745972 581000))
|
||||
;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22514 17679
|
||||
;;;;;; 792739 610000))
|
||||
;;; Generated autoloads from helm-eshell.el
|
||||
|
||||
(autoload 'helm-esh-pcomplete "helm-eshell" "\
|
||||
@ -231,8 +231,8 @@ Preconfigured helm for eshell history.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-eval" "helm-eval.el" (22508 49901 825972
|
||||
;;;;;; 752000))
|
||||
;;;### (autoloads nil "helm-eval" "helm-eval.el" (22514 17679 864739
|
||||
;;;;;; 775000))
|
||||
;;; Generated autoloads from helm-eval.el
|
||||
|
||||
(autoload 'helm-eval-expression "helm-eval" "\
|
||||
@ -252,8 +252,8 @@ Preconfigured helm for `helm-source-calculation-result'.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-external" "helm-external.el" (22508 49901
|
||||
;;;;;; 701972 487000))
|
||||
;;;### (autoloads nil "helm-external" "helm-external.el" (22514 17679
|
||||
;;;;;; 748739 508000))
|
||||
;;; Generated autoloads from helm-external.el
|
||||
|
||||
(autoload 'helm-run-external-command "helm-external" "\
|
||||
@ -266,8 +266,8 @@ You can set your own list of commands with
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-files" "helm-files.el" (22508 49901 801972
|
||||
;;;;;; 701000))
|
||||
;;;### (autoloads nil "helm-files" "helm-files.el" (22514 17679 836739
|
||||
;;;;;; 710000))
|
||||
;;; Generated autoloads from helm-files.el
|
||||
|
||||
(autoload 'helm-projects-history "helm-files" "\
|
||||
@ -355,8 +355,8 @@ It allows additionally to delete more than one connection at once.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-font" "helm-font.el" (22508 49901 749972
|
||||
;;;;;; 589000))
|
||||
;;;### (autoloads nil "helm-font" "helm-font.el" (22514 17679 796739
|
||||
;;;;;; 619000))
|
||||
;;; Generated autoloads from helm-font.el
|
||||
|
||||
(autoload 'helm-select-xfont "helm-font" "\
|
||||
@ -371,8 +371,8 @@ Preconfigured helm for `ucs-names' math symbols.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-grep" "helm-grep.el" (22508 49901 889972
|
||||
;;;;;; 888000))
|
||||
;;;### (autoloads nil "helm-grep" "helm-grep.el" (22514 17679 928739
|
||||
;;;;;; 921000))
|
||||
;;; Generated autoloads from helm-grep.el
|
||||
|
||||
(autoload 'helm-goto-precedent-file "helm-grep" "\
|
||||
@ -399,8 +399,8 @@ With a prefix arg ARG git-grep the whole repository.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-help" "helm-help.el" (22508 49901 697972
|
||||
;;;;;; 478000))
|
||||
;;;### (autoloads nil "helm-help" "helm-help.el" (22514 17679 744739
|
||||
;;;;;; 499000))
|
||||
;;; Generated autoloads from helm-help.el
|
||||
|
||||
(autoload 'helm-documentation "helm-help" "\
|
||||
@ -420,8 +420,8 @@ String displayed in mode-line in `helm-source-find-files'.")
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22508 49901
|
||||
;;;;;; 781972 658000))
|
||||
;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22514 17679
|
||||
;;;;;; 820739 673000))
|
||||
;;; Generated autoloads from helm-id-utils.el
|
||||
|
||||
(autoload 'helm-gid "helm-id-utils" "\
|
||||
@ -435,8 +435,8 @@ See <https://www.gnu.org/software/idutils/>.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22508 49901 761972
|
||||
;;;;;; 615000))
|
||||
;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22514 17679 808739
|
||||
;;;;;; 646000))
|
||||
;;; Generated autoloads from helm-imenu.el
|
||||
|
||||
(autoload 'helm-imenu "helm-imenu" "\
|
||||
@ -453,8 +453,8 @@ or it have an association in `helm-imenu-all-buffer-assoc'.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-info" "helm-info.el" (22508 49901 753972
|
||||
;;;;;; 597000))
|
||||
;;;### (autoloads nil "helm-info" "helm-info.el" (22514 17679 800739
|
||||
;;;;;; 627000))
|
||||
;;; Generated autoloads from helm-info.el
|
||||
|
||||
(autoload 'helm-info "helm-info" "\
|
||||
@ -470,8 +470,8 @@ With a prefix-arg insert symbol at point.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-locate" "helm-locate.el" (22508 49901
|
||||
;;;;;; 705972 496000))
|
||||
;;;### (autoloads nil "helm-locate" "helm-locate.el" (22514 17679
|
||||
;;;;;; 752739 518000))
|
||||
;;; Generated autoloads from helm-locate.el
|
||||
|
||||
(autoload 'helm-projects-find-files "helm-locate" "\
|
||||
@ -498,8 +498,8 @@ Where db_path is a filename matched by
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-man" "helm-man.el" (22508 49901 829972
|
||||
;;;;;; 760000))
|
||||
;;;### (autoloads nil "helm-man" "helm-man.el" (22514 17679 876739
|
||||
;;;;;; 802000))
|
||||
;;; Generated autoloads from helm-man.el
|
||||
|
||||
(autoload 'helm-man-woman "helm-man" "\
|
||||
@ -510,8 +510,8 @@ With a prefix arg reinitialize the cache.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-misc" "helm-misc.el" (22508 49901 813972
|
||||
;;;;;; 726000))
|
||||
;;;### (autoloads nil "helm-misc" "helm-misc.el" (22514 17679 856739
|
||||
;;;;;; 756000))
|
||||
;;; Generated autoloads from helm-misc.el
|
||||
|
||||
(autoload 'helm-browse-menubar "helm-misc" "\
|
||||
@ -552,8 +552,8 @@ Preconfigured `helm' that provide completion of `comint' history.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-mode" "helm-mode.el" (22508 49901 681972
|
||||
;;;;;; 445000))
|
||||
;;;### (autoloads nil "helm-mode" "helm-mode.el" (22514 17679 720739
|
||||
;;;;;; 444000))
|
||||
;;; Generated autoloads from helm-mode.el
|
||||
|
||||
(autoload 'helm-comp-read "helm-mode" "\
|
||||
@ -724,8 +724,8 @@ Note: This mode is incompatible with Emacs23.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-net" "helm-net.el" (22508 49901 849972
|
||||
;;;;;; 803000))
|
||||
;;;### (autoloads nil "helm-net" "helm-net.el" (22514 17679 900739
|
||||
;;;;;; 857000))
|
||||
;;; Generated autoloads from helm-net.el
|
||||
|
||||
(autoload 'helm-surfraw "helm-net" "\
|
||||
@ -745,8 +745,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-org" "helm-org.el" (22508 49901 893972
|
||||
;;;;;; 897000))
|
||||
;;;### (autoloads nil "helm-org" "helm-org.el" (22514 17679 932739
|
||||
;;;;;; 930000))
|
||||
;;; Generated autoloads from helm-org.el
|
||||
|
||||
(autoload 'helm-org-agenda-files-headings "helm-org" "\
|
||||
@ -777,8 +777,8 @@ Preconfigured helm for org templates.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22508 49901
|
||||
;;;;;; 837972 778000))
|
||||
;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22514 17679
|
||||
;;;;;; 888739 830000))
|
||||
;;; Generated autoloads from helm-regexp.el
|
||||
|
||||
(autoload 'helm-moccur-mode "helm-regexp" "\
|
||||
@ -817,8 +817,8 @@ The prefix arg can be set before calling
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-ring" "helm-ring.el" (22508 49901 693972
|
||||
;;;;;; 470000))
|
||||
;;;### (autoloads nil "helm-ring" "helm-ring.el" (22514 17679 732739
|
||||
;;;;;; 472000))
|
||||
;;; Generated autoloads from helm-ring.el
|
||||
|
||||
(defvar helm-push-mark-mode nil "\
|
||||
@ -876,8 +876,8 @@ This command is useful when used with persistent action.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22508 49901
|
||||
;;;;;; 765972 624000))
|
||||
;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22514 17679
|
||||
;;;;;; 812739 655000))
|
||||
;;; Generated autoloads from helm-semantic.el
|
||||
|
||||
(autoload 'helm-semantic "helm-semantic" "\
|
||||
@ -899,8 +899,8 @@ Fill in the symbol at point by default.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-sys" "helm-sys.el" (22508 49901 789972
|
||||
;;;;;; 674000))
|
||||
;;;### (autoloads nil "helm-sys" "helm-sys.el" (22514 17679 828739
|
||||
;;;;;; 692000))
|
||||
;;; Generated autoloads from helm-sys.el
|
||||
|
||||
(defvar helm-top-poll-mode nil "\
|
||||
@ -935,8 +935,8 @@ Preconfigured helm for xrandr.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-tags" "helm-tags.el" (22508 49901 741972
|
||||
;;;;;; 572000))
|
||||
;;;### (autoloads nil "helm-tags" "helm-tags.el" (22514 17679 788739
|
||||
;;;;;; 600000))
|
||||
;;; Generated autoloads from helm-tags.el
|
||||
|
||||
(autoload 'helm-etags-select "helm-tags" "\
|
||||
@ -955,8 +955,8 @@ This function aggregates three sources of tag files:
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-utils" "helm-utils.el" (22508 49901 717972
|
||||
;;;;;; 521000))
|
||||
;;;### (autoloads nil "helm-utils" "helm-utils.el" (22514 17679 764739
|
||||
;;;;;; 545000))
|
||||
;;; Generated autoloads from helm-utils.el
|
||||
|
||||
(defvar helm-popup-tip-mode nil "\
|
||||
@ -977,7 +977,7 @@ Show help-echo informations in a popup tip at end of line.
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil nil ("helm-easymenu.el" "helm-pkg.el" "helm-types.el")
|
||||
;;;;;; (22508 49901 897972 906000))
|
||||
;;;;;; (22514 17679 936739 940000))
|
||||
|
||||
;;;***
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
(define-package "helm" "20160928.2212" "Helm is an Emacs incremental and narrowing framework"
|
||||
(define-package "helm" "20160929.1313" "Helm is an Emacs incremental and narrowing framework"
|
||||
'((emacs "24.4")
|
||||
(async "1.9")
|
||||
(popup "0.5.3")
|
||||
(helm-core "2.1.0"))
|
||||
(helm-core "2.2.0"))
|
||||
:url "https://emacs-helm.github.io/helm/")
|
||||
;; Local Variables:
|
||||
;; no-byte-compile: t
|
||||
@ -3,7 +3,7 @@
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "helm" "helm.el" (22508 49900 897970 770000))
|
||||
;;;### (autoloads nil "helm" "helm.el" (22514 17675 208729 97000))
|
||||
;;; Generated autoloads from helm.el
|
||||
|
||||
(autoload 'helm-define-multi-key "helm" "\
|
||||
@ -188,7 +188,7 @@ Enable/disable helm debugging from outside of helm session.
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil nil ("helm-core-pkg.el" "helm-lib.el" "helm-multi-match.el"
|
||||
;;;;;; "helm-source.el") (22508 49900 909970 796000))
|
||||
;;;;;; "helm-source.el") (22514 17675 228729 143000))
|
||||
|
||||
;;;***
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
(define-package "helm-core" "20160928.324" "Development files for Helm"
|
||||
(define-package "helm-core" "20160929.1313" "Development files for Helm"
|
||||
'((emacs "24.4")
|
||||
(async "1.9"))
|
||||
:url "https://emacs-helm.github.io/helm/")
|
||||
@ -1,177 +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: 315897
|
||||
|
||||
Tag Table:
|
||||
(Indirect)
|
||||
Node: Top1222
|
||||
Node: Introduction6446
|
||||
Node: Installation11169
|
||||
Node: Updating from an older release11544
|
||||
Node: Installing from an Elpa archive13139
|
||||
Node: Installing from the Git repository14478
|
||||
Node: Post-installation tasks17325
|
||||
Node: Getting started18714
|
||||
Node: Interface concepts24443
|
||||
Node: Modes and Buffers24717
|
||||
Node: Switching Buffers26462
|
||||
Node: Naming Buffers31003
|
||||
Node: Quitting Windows33838
|
||||
Node: Automatic Refreshing of Magit Buffers35470
|
||||
Node: Automatic Saving of File-Visiting Buffers38238
|
||||
Node: Automatic Reverting of File-Visiting Buffers39423
|
||||
Node: Risk of Reverting Automatically44419
|
||||
Node: Sections46802
|
||||
Node: Section movement47743
|
||||
Node: Section visibility51670
|
||||
Node: Section hooks55261
|
||||
Node: Section types and values57542
|
||||
Node: Section options58812
|
||||
Node: Popup buffers and prefix commands59284
|
||||
Node: Completion and confirmation60598
|
||||
Node: Running Git63504
|
||||
Node: Viewing Git output63740
|
||||
Node: Running Git manually64740
|
||||
Node: Git executable66866
|
||||
Node: Global Git arguments68873
|
||||
Node: Inspecting69680
|
||||
Node: Status buffer70827
|
||||
Node: Status sections73692
|
||||
Node: Status header sections79401
|
||||
Node: Status options81958
|
||||
Node: Repository list82682
|
||||
Node: Logging84840
|
||||
Node: Refreshing logs87578
|
||||
Node: Log Buffer88963
|
||||
Node: Select from log92259
|
||||
Node: Reflog93199
|
||||
Node: Diffing93677
|
||||
Node: Refreshing diffs96697
|
||||
Node: Diff buffer99678
|
||||
Node: Diff options101580
|
||||
Node: Revision buffer103336
|
||||
Node: Ediffing104291
|
||||
Node: References buffer107881
|
||||
Node: References sections112591
|
||||
Node: Bisecting113466
|
||||
Node: Visiting blobs115205
|
||||
Node: Blaming115714
|
||||
Node: Manipulating119144
|
||||
Node: Repository setup119460
|
||||
Node: Staging and unstaging120500
|
||||
Node: Staging from file-visiting buffers124589
|
||||
Node: Applying125757
|
||||
Node: Committing127650
|
||||
Node: Initiating a commit128233
|
||||
Node: Editing commit messages131545
|
||||
Node: Branching141941
|
||||
Node: The two remotes142141
|
||||
Node: The branch popup144685
|
||||
Node: The branch config popup150912
|
||||
Node: Merging156818
|
||||
Node: Resolving conflicts158986
|
||||
Ref: orgradiotarget1160071
|
||||
Node: Rebasing163943
|
||||
Node: Editing rebase sequences167584
|
||||
Node: Information about in-progress rebase170614
|
||||
Ref: Information about in-progress rebase-Footnote-1177450
|
||||
Node: Cherry picking178036
|
||||
Node: Reverting179642
|
||||
Node: Resetting181005
|
||||
Node: Stashing182517
|
||||
Node: Transferring185691
|
||||
Node: Remotes185929
|
||||
Node: Fetching187215
|
||||
Node: Pulling188581
|
||||
Node: Pushing189427
|
||||
Node: Creating and sending patches194171
|
||||
Node: Applying patches194866
|
||||
Node: Miscellaneous195864
|
||||
Node: Tagging196167
|
||||
Node: Notes196952
|
||||
Node: Submodules199477
|
||||
Node: Listing submodules199692
|
||||
Node: Submodule popup201511
|
||||
Node: Subtree202794
|
||||
Node: Common commands204042
|
||||
Node: Wip modes205787
|
||||
Node: Minor mode for buffers visiting files212523
|
||||
Node: Minor mode for buffers visiting blobs215997
|
||||
Node: Customizing216802
|
||||
Node: Per-repository configuration218474
|
||||
Node: Essential settings220108
|
||||
Node: Safety220432
|
||||
Node: Performance222265
|
||||
Node: Plumbing230227
|
||||
Node: Calling Git231051
|
||||
Node: Getting a value from Git232574
|
||||
Node: Calling Git for effect235678
|
||||
Node: Section plumbing242182
|
||||
Node: Creating sections242410
|
||||
Node: Section selection246309
|
||||
Node: Matching sections247989
|
||||
Node: Refreshing buffers253198
|
||||
Node: Conventions256333
|
||||
Node: Confirmation and completion256510
|
||||
Node: Theming Faces257408
|
||||
Node: FAQ265559
|
||||
Node: Magit is slow267172
|
||||
Node: I changed several thousand files at once and now Magit is unusable267373
|
||||
Node: I am having problems committing268089
|
||||
Node: Diffs are collapsed after un-/staging268535
|
||||
Node: I don't understand how branching and pushing work270013
|
||||
Node: I don't like the key binding in v24270388
|
||||
Node: I cannot install the pre-requisites for Magit v2270727
|
||||
Node: I am using an Emacs release older than v244271192
|
||||
Node: I am using a Git release older than v194272805
|
||||
Node: I am using MS Windows and cannot push with Magit273792
|
||||
Node: I am using OS X and SOMETHING works in shell but not in Magit274396
|
||||
Node: How to install the gitman info manual?275187
|
||||
Node: How can I show Git's output?277728
|
||||
Node: Diffs contain control sequences278515
|
||||
Node: Expanding a file to show the diff causes it to disappear279520
|
||||
Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer280055
|
||||
Node: The mode-line information isn't always up-to-date281085
|
||||
Node: Can Magit be used as ‘ediff-version-control-package’?282153
|
||||
Node: How to show diffs for gpg-encrypted files?284197
|
||||
Node: Emacs 245 hangs when loading Magit284794
|
||||
Node: Symbol's value as function is void ‘--some’285369
|
||||
Node: Where is the branch manager285703
|
||||
Node: Keystroke Index285994
|
||||
Node: Command Index315897
|
||||
Node: Function Index345906
|
||||
Node: Variable Index359800
|
||||
|
||||
End Tag Table
|
||||
|
||||
|
||||
Local Variables:
|
||||
coding: utf-8
|
||||
End:
|
||||
@ -503,6 +503,8 @@ By default, this is the same except for the \"pick\" command."
|
||||
(eval-after-load 'recentf
|
||||
'(add-to-list 'recentf-exclude git-rebase-filename-regexp))
|
||||
|
||||
(add-to-list 'with-editor-file-name-history-exclude git-rebase-filename-regexp)
|
||||
|
||||
(provide 'git-rebase)
|
||||
;; Local Variables:
|
||||
;; indent-tabs-mode: nil
|
||||
@ -3,8 +3,8 @@
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22508 49899 553967
|
||||
;;;;;; 882000))
|
||||
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22514 17669 780716
|
||||
;;;;;; 655000))
|
||||
;;; 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" (22508 49899 645968 80000))
|
||||
;;;### (autoloads nil "magit" "magit.el" (22514 17669 864716 848000))
|
||||
;;; Generated autoloads from magit.el
|
||||
|
||||
(autoload 'magit-status "magit" "\
|
||||
@ -149,7 +149,18 @@ current branch will be used as the starting point as usual, but
|
||||
the upstream of the starting-point may be used as the upstream
|
||||
of the new branch, instead of the starting-point itself.
|
||||
|
||||
\(fn BRANCH &rest ARGS)" t nil)
|
||||
If optional FROM is non-nil, then the source branch is reset to
|
||||
that commit, instead of to the last commit it shares with its
|
||||
upstream. Interactively, FROM is non-nil, when the region
|
||||
selects some commits, and among those commits, FROM it is the
|
||||
commit that is the fewest commits ahead of the source branch.
|
||||
|
||||
The commit at the other end of the selection actually does not
|
||||
matter, all commits between FROM and `HEAD' are moved to the new
|
||||
branch. If FROM is not reachable from `HEAD' or is reachable
|
||||
from the source branch's upstream, then an error is raised.
|
||||
|
||||
\(fn BRANCH &optional FROM &rest ARGS)" t nil)
|
||||
|
||||
(autoload 'magit-branch-reset "magit" "\
|
||||
Reset a branch to the tip of another branch or any other commit.
|
||||
@ -490,8 +501,8 @@ Git, and Emacs in the echo area.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22508 49899
|
||||
;;;;;; 581967 942000))
|
||||
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22514 17669
|
||||
;;;;;; 804716 711000))
|
||||
;;; Generated autoloads from magit-apply.el
|
||||
|
||||
(autoload 'magit-stage-file "magit-apply" "\
|
||||
@ -527,8 +538,8 @@ Remove all changes from the staging area.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22508
|
||||
;;;;;; 49899 517967 805000))
|
||||
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22514
|
||||
;;;;;; 17669 740716 563000))
|
||||
;;; Generated autoloads from magit-autorevert.el
|
||||
|
||||
(defvar magit-revert-buffers t)
|
||||
@ -557,8 +568,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22508 49899
|
||||
;;;;;; 573967 925000))
|
||||
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22514 17669
|
||||
;;;;;; 800716 701000))
|
||||
;;; Generated autoloads from magit-bisect.el
|
||||
(autoload 'magit-bisect-popup "magit-bisect" nil t)
|
||||
|
||||
@ -609,8 +620,8 @@ bisect run'.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22508 49899
|
||||
;;;;;; 633968 55000))
|
||||
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22514 17669
|
||||
;;;;;; 852716 820000))
|
||||
;;; Generated autoloads from magit-blame.el
|
||||
(autoload 'magit-blame-popup "magit-blame" nil t)
|
||||
|
||||
@ -634,8 +645,8 @@ only arguments available from `magit-blame-popup' should be used.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22508 49899
|
||||
;;;;;; 521967 813000))
|
||||
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22514 17669
|
||||
;;;;;; 744716 573000))
|
||||
;;; Generated autoloads from magit-commit.el
|
||||
|
||||
(autoload 'magit-commit "magit-commit" "\
|
||||
@ -717,8 +728,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22508 49899 625968
|
||||
;;;;;; 38000))
|
||||
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22514 17669 848716
|
||||
;;;;;; 811000))
|
||||
;;; Generated autoloads from magit-diff.el
|
||||
|
||||
(autoload 'magit-diff-popup "magit-diff" "\
|
||||
@ -802,8 +813,8 @@ for a revision.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22508 49899
|
||||
;;;;;; 613968 12000))
|
||||
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22514 17669
|
||||
;;;;;; 832716 774000))
|
||||
;;; Generated autoloads from magit-ediff.el
|
||||
(autoload 'magit-ediff-popup "magit-ediff" nil t)
|
||||
|
||||
@ -891,8 +902,8 @@ stash that were staged.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22508 49899
|
||||
;;;;;; 529967 831000))
|
||||
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22514 17669
|
||||
;;;;;; 748716 582000))
|
||||
;;; Generated autoloads from magit-extras.el
|
||||
|
||||
(autoload 'magit-run-git-gui "magit-extras" "\
|
||||
@ -962,8 +973,8 @@ on a position in a file-visiting buffer.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-log" "magit-log.el" (22508 49899 617968
|
||||
;;;;;; 20000))
|
||||
;;;### (autoloads nil "magit-log" "magit-log.el" (22514 17669 840716
|
||||
;;;;;; 793000))
|
||||
;;; Generated autoloads from magit-log.el
|
||||
|
||||
(autoload 'magit-log-buffer-file-popup "magit-log" "\
|
||||
@ -1045,8 +1056,8 @@ Show commits in a branch that are not merged in the upstream branch.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22508 49899
|
||||
;;;;;; 657968 106000))
|
||||
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22514 17669
|
||||
;;;;;; 880716 885000))
|
||||
;;; Generated autoloads from magit-remote.el
|
||||
|
||||
(autoload 'magit-clone "magit-remote" "\
|
||||
@ -1278,8 +1289,8 @@ is asked to pull. START has to be reachable from that commit.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22508
|
||||
;;;;;; 49899 649968 89000))
|
||||
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22514
|
||||
;;;;;; 17669 868716 857000))
|
||||
;;; Generated autoloads from magit-sequence.el
|
||||
|
||||
(autoload 'magit-sequencer-continue "magit-sequence" "\
|
||||
@ -1429,8 +1440,8 @@ Abort the current rebase operation, restoring the original branch.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22508 49899
|
||||
;;;;;; 597967 977000))
|
||||
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22514 17669
|
||||
;;;;;; 824716 757000))
|
||||
;;; Generated autoloads from magit-stash.el
|
||||
(autoload 'magit-stash-popup "magit-stash" nil t)
|
||||
|
||||
@ -1529,8 +1540,8 @@ Show all diffs of a stash in a buffer.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22508
|
||||
;;;;;; 49899 681968 158000))
|
||||
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22514
|
||||
;;;;;; 17669 892716 912000))
|
||||
;;; Generated autoloads from magit-submodule.el
|
||||
(autoload 'magit-submodule-popup "magit-submodule" nil t)
|
||||
|
||||
@ -1620,8 +1631,8 @@ Display a list of the current repository's submodules.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22508 49899
|
||||
;;;;;; 565967 908000))
|
||||
;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22514 17669
|
||||
;;;;;; 788716 674000))
|
||||
;;; Generated autoloads from magit-subtree.el
|
||||
(autoload 'magit-subtree-popup "magit-subtree" nil t)
|
||||
|
||||
@ -1657,8 +1668,8 @@ Extract the history of the subtree PREFIX.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22508 49899 541967
|
||||
;;;;;; 857000))
|
||||
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22514 17669 756716
|
||||
;;;;;; 601000))
|
||||
;;; Generated autoloads from magit-wip.el
|
||||
|
||||
(defvar magit-wip-after-save-mode nil "\
|
||||
@ -1728,7 +1739,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")
|
||||
;;;;;; (22508 49899 669968 132000))
|
||||
;;;;;; (22514 17669 884716 893000))
|
||||
|
||||
;;;***
|
||||
|
||||
@ -100,17 +100,64 @@ member of `magit-section-highlight-hook', which see."
|
||||
:type 'boolean)
|
||||
|
||||
(defcustom magit-diff-show-lines-boundary t
|
||||
"Whether to delimit hunk-internal region with thin lines.
|
||||
|
||||
When a hunk-internal region (used to stage just the lines that
|
||||
fall into the region instead of the complete hunk) only covers
|
||||
context lines, then these lines are the only visual indicator
|
||||
for the region. In character-only terminals it's not possible
|
||||
to draw thin lines."
|
||||
"This option is obsolete.
|
||||
If you have set this to nil, then remove that customization, and
|
||||
instead customize `magit-diff-highlight-hunk-region-functions'."
|
||||
:package-version '(magit . "2.1.0")
|
||||
:group 'magit-diff
|
||||
:type 'boolean)
|
||||
|
||||
(make-obsolete-variable 'magit-diff-show-lines-boundary
|
||||
'magit-diff-highlight-hunk-region-functions
|
||||
"Magit 2.9.0")
|
||||
|
||||
(defcustom magit-diff-highlight-hunk-region-functions
|
||||
`(magit-diff-highlight-hunk-region-dim-outside
|
||||
,@(and magit-diff-show-lines-boundary
|
||||
(list (if t ;(version< emacs-version "25.1")
|
||||
'magit-diff-highlight-hunk-region-using-overlays
|
||||
'magit-diff-highlight-hunk-region-using-underline))))
|
||||
"The functions used to highlight the hunk-internal region.
|
||||
|
||||
`magit-diff-highlight-hunk-region-dim-outside' overlays the outside
|
||||
of the hunk internal selection with a face that causes the added and
|
||||
removed lines to have the same background color as context lines.
|
||||
This function should not be removed from the value of this option.
|
||||
|
||||
TEMPORARY NOTICE: there is a severe bug in
|
||||
`magit-diff-highlight-hunk-region-using-underline'
|
||||
and it has been temporarily removed.
|
||||
|
||||
`magit-diff-highlight-hunk-region-using-overlays' and
|
||||
`magit-diff-highlight-hunk-region-using-underline' emphasize the
|
||||
region by placing delimiting horizonal lines before and after it.
|
||||
Which implementation is preferable depends on the Emacs version,
|
||||
and the more suitable one is part of the default value.
|
||||
|
||||
Instead of, or in addition to, using delimiting horizontal lines,
|
||||
to emphasize the boundaries, you may which to emphasize the text
|
||||
itself, using `magit-diff-highlight-hunk-region-using-face'.
|
||||
|
||||
In terminal frames it's not possible to draw lines as the overlay
|
||||
and underline variants normally do, so there they fall back to
|
||||
calling the face function instead."
|
||||
:package-version '(magit . "2.9.0")
|
||||
:set-after '(magit-diff-show-lines-boundaries)
|
||||
:group 'magit-diff
|
||||
:type 'hook
|
||||
:options '(magit-diff-highlight-hunk-region-dim-outside
|
||||
magit-diff-highlight-hunk-region-using-overlays
|
||||
magit-diff-highlight-hunk-region-using-face))
|
||||
|
||||
(defcustom magit-diff-unmarked-lines-keep-foreground t
|
||||
"Whether `magit-diff-highlight-hunk-region-dim-outside' preserves foreground.
|
||||
When this is set to nil, then that function only adjusts the
|
||||
foreground color but added and removed lines outside the region
|
||||
keep their distinct foreground colors."
|
||||
:package-version '(magit . "2.9.0")
|
||||
:group 'magit-diff
|
||||
:type 'boolean)
|
||||
|
||||
(defcustom magit-diff-refine-hunk nil
|
||||
"Whether to show word-granularity differences within diff hunks.
|
||||
|
||||
@ -313,6 +360,18 @@ and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7847."
|
||||
"Face for selected diff hunk headings."
|
||||
:group 'magit-faces)
|
||||
|
||||
(defface magit-diff-hunk-region
|
||||
'((t :inherit bold))
|
||||
"Face used by `magit-diff-highlight-hunk-region-using-face'.
|
||||
|
||||
This face is overlayed over text that uses other hunk faces,
|
||||
and those normally set the foreground and background colors.
|
||||
The `:foreground' and especially the `:background' properties
|
||||
should be avoided here. Setting the latter would cause the
|
||||
lose of information. Good properties to set here are `:weight'
|
||||
and `:slant'."
|
||||
:group 'magit-faces)
|
||||
|
||||
(defface magit-diff-lines-heading
|
||||
'((((class color) (background light))
|
||||
:inherit magit-diff-hunk-heading-highlight
|
||||
@ -1868,7 +1927,8 @@ selects a valid group of diff related sections, the type of these
|
||||
sections, i.e. `hunks' or `files'. If SECTION, or if that is nil
|
||||
the current section, is a `hunk' section; and the region region
|
||||
starts and ends inside the body of a that section, then the type
|
||||
is `region'.
|
||||
is `region'. If the region is empty after a mouse click, then
|
||||
`hunk' is returned instead of `region'.
|
||||
|
||||
If optional STRICT is non-nil then return nil if the diff type of
|
||||
the section at point is `untracked' or the section at point is not
|
||||
@ -1883,7 +1943,7 @@ actually a `diff' but a `diffstat' section."
|
||||
'diffstat)))))
|
||||
(pcase (list (magit-section-type section)
|
||||
(and siblings t)
|
||||
(and (region-active-p) t)
|
||||
(magit-diff-use-hunk-region-p)
|
||||
ssection)
|
||||
(`(hunk nil t ,_)
|
||||
(if (magit-section-internal-region-p section) 'region 'hunk))
|
||||
@ -1894,6 +1954,20 @@ actually a `diff' but a `diffstat' section."
|
||||
(`(,(or `staged `unstaged `untracked)
|
||||
nil ,_ ,_) 'list)))))
|
||||
|
||||
(defun magit-diff-use-hunk-region-p ()
|
||||
(and (region-active-p)
|
||||
(not (and (if (version< emacs-version "25.1")
|
||||
(eq this-command 'mouse-drag-region)
|
||||
;; TODO implement this from first principals
|
||||
;; currently it's trial-and-error
|
||||
(or (eq this-command 'mouse-drag-region)
|
||||
(eq last-command 'mouse-drag-region)
|
||||
;; When another window was previously
|
||||
;; selected then the last-command is
|
||||
;; some byte-code function.
|
||||
(byte-code-function-p last-command)))
|
||||
(eq (region-end) (region-beginning))))))
|
||||
|
||||
;;; Diff Highlight
|
||||
|
||||
(defun magit-diff-unhighlight (section selection)
|
||||
@ -2088,47 +2162,76 @@ are highlighted."
|
||||
(save-excursion (goto-char (region-end))
|
||||
(line-end-position)))
|
||||
|
||||
(defvar magit-diff-unmarked-lines-keep-foreground t)
|
||||
|
||||
(defun magit-diff-update-hunk-region (section)
|
||||
(when (and (eq (magit-diff-scope section t) 'region)
|
||||
(not (and (if (version< emacs-version "25.1")
|
||||
(eq this-command 'mouse-drag-region)
|
||||
(or (eq last-command 'mouse-drag-region)
|
||||
;; When another window was previously
|
||||
;; selected then the last-command is
|
||||
;; a byte-code function.
|
||||
(byte-code-function-p last-command)))
|
||||
(eq (region-end) (region-beginning)))))
|
||||
(let ((sbeg (magit-section-start section))
|
||||
(cbeg (magit-section-content section))
|
||||
(rbeg (magit-diff-hunk-region-beginning))
|
||||
(rend (magit-diff-hunk-region-end))
|
||||
(send (magit-section-end section))
|
||||
(face (if magit-diff-highlight-hunk-body
|
||||
'magit-diff-context-highlight
|
||||
'magit-diff-context)))
|
||||
(when magit-diff-unmarked-lines-keep-foreground
|
||||
(setq face (list :background (face-attribute face :background))))
|
||||
(cl-flet ((ov (start end &rest args)
|
||||
(let ((ov (make-overlay start end nil t)))
|
||||
(overlay-put ov 'evaporate t)
|
||||
(while args (overlay-put ov (pop args) (pop args)))
|
||||
(push ov magit-region-overlays)
|
||||
ov)))
|
||||
(ov sbeg cbeg 'face 'magit-diff-lines-heading
|
||||
'display (concat (magit-diff-hunk-region-header section) "\n"))
|
||||
(ov cbeg rbeg 'face face 'priority 2)
|
||||
(when (and (window-system) magit-diff-show-lines-boundary)
|
||||
(ov rbeg (1+ rbeg) 'before-string
|
||||
(propertize (concat (propertize "\s" 'display '(space :height (1)))
|
||||
(propertize "\n" 'line-height t))
|
||||
'face 'magit-diff-lines-boundary))
|
||||
(ov rend (1+ rend) 'after-string
|
||||
(propertize (concat (propertize "\s" 'display '(space :height (1)))
|
||||
(propertize "\n" 'line-height t))
|
||||
'face 'magit-diff-lines-boundary)))
|
||||
(ov (1+ rend) send 'face face 'priority 2)))))
|
||||
(when (eq (magit-diff-scope section t) 'region)
|
||||
(magit-diff--make-hunk-overlay
|
||||
(magit-section-start section)
|
||||
(1- (magit-section-content section))
|
||||
'face 'magit-diff-lines-heading
|
||||
'display (magit-diff-hunk-region-header section)
|
||||
'after-string (magit-diff--hunk-after-string 'magit-diff-lines-heading))
|
||||
(run-hook-with-args 'magit-diff-highlight-hunk-region-functions section)
|
||||
t))
|
||||
|
||||
(defun magit-diff-highlight-hunk-region-dim-outside (section)
|
||||
"Dim the parts of the hunk that are outside the hunk-internal region.
|
||||
This is done by using the same foreground and background color
|
||||
for added and removed lines as for context lines."
|
||||
(let ((face (if magit-diff-highlight-hunk-body
|
||||
'magit-diff-context-highlight
|
||||
'magit-diff-context)))
|
||||
(when magit-diff-unmarked-lines-keep-foreground
|
||||
(setq face (list :background (face-attribute face :background))))
|
||||
(magit-diff--make-hunk-overlay (magit-section-content section)
|
||||
(magit-diff-hunk-region-beginning)
|
||||
'face face
|
||||
'priority 2)
|
||||
(magit-diff--make-hunk-overlay (1+ (magit-diff-hunk-region-end))
|
||||
(magit-section-end section)
|
||||
'face face
|
||||
'priority 2)))
|
||||
|
||||
(defun magit-diff-highlight-hunk-region-using-face (_section)
|
||||
"Highlight the hunk-internal region by making it bold.
|
||||
Or rather highlight using the face `magit-diff-hunk-region', though
|
||||
changing only the `:weight' and/or `:slant' is recommended for that
|
||||
face."
|
||||
(magit-diff--make-hunk-overlay (magit-diff-hunk-region-beginning)
|
||||
(1+ (magit-diff-hunk-region-end))
|
||||
'face 'magit-diff-hunk-region))
|
||||
|
||||
(defun magit-diff-highlight-hunk-region-using-overlays (section)
|
||||
"Emphasize the hunk-internal region using delimiting horizontal lines.
|
||||
This is implemented as single-pixel newlines places inside overlays.
|
||||
Although creating overlays containing newlines is discouraged,
|
||||
this version turns out to be less glitchy on Emacs 24 than the
|
||||
other method."
|
||||
(if (window-system)
|
||||
(let ((beg (magit-diff-hunk-region-beginning))
|
||||
(end (magit-diff-hunk-region-end))
|
||||
(str (propertize
|
||||
(concat (propertize "\s" 'display '(space :height (1)))
|
||||
(propertize "\n" 'line-height t))
|
||||
'face 'magit-diff-lines-boundary)))
|
||||
(magit-diff--make-hunk-overlay beg (1+ beg) 'before-string str)
|
||||
(magit-diff--make-hunk-overlay end (1+ end) 'after-string str))
|
||||
(magit-diff-highlight-hunk-region-using-face section)))
|
||||
|
||||
(defun magit-diff--make-hunk-overlay (start end &rest args)
|
||||
(let ((ov (make-overlay start end nil t)))
|
||||
(overlay-put ov 'evaporate t)
|
||||
(while args (overlay-put ov (pop args) (pop args)))
|
||||
(push ov magit-region-overlays)
|
||||
ov))
|
||||
|
||||
(defun magit-diff--hunk-after-string (face)
|
||||
(propertize "\s"
|
||||
'face face
|
||||
'display (list 'space :align-to `(+ (,(window-body-width nil t))
|
||||
,(window-hscroll)))
|
||||
;; This prevents the cursor from being rendered at the
|
||||
;; edge of the window.
|
||||
'cursor t))
|
||||
|
||||
;;; Diff Extract
|
||||
|
||||
@ -613,11 +613,18 @@ Sorted from longest to shortest CYGWIN name."
|
||||
(concat win (substring filename (length cyg)))
|
||||
filename))
|
||||
|
||||
(defun magit-convert-git-filename (filename)
|
||||
(-if-let ((cyg . win)
|
||||
(cl-rassoc filename magit-cygwin-mount-points
|
||||
:test (lambda (f win) (string-prefix-p win f))))
|
||||
(concat cyg (substring filename (length win)))
|
||||
(defun magit-convert-filename-for-git (filename)
|
||||
"Convert FILENAME so that it can be passed to git.
|
||||
1. If it's a remote filename, then remove the remote part.
|
||||
2. Expand \"~/\", git isn't a shell and does not understand it.
|
||||
3. Deal with an `windows-nt' Emacs vs. Cygwin Git incompatibility."
|
||||
(if (file-name-absolute-p filename)
|
||||
(-if-let ((cyg . win)
|
||||
(cl-rassoc filename magit-cygwin-mount-points
|
||||
:test (lambda (f win) (string-prefix-p win f))))
|
||||
(concat cyg (substring filename (length win)))
|
||||
(or (file-remote-p filename 'localname)
|
||||
filename))
|
||||
filename))
|
||||
|
||||
(defun magit-decode-git-path (path)
|
||||
@ -1069,6 +1076,10 @@ where COMMITS is the number of commits in TAG but not in REV."
|
||||
(or (car (member rev (magit-list-local-branches)))
|
||||
(car (member rev (magit-list-local-branch-names)))))
|
||||
|
||||
(defun magit-remote-branch-p (rev)
|
||||
(or (car (member rev (magit-list-remote-branches)))
|
||||
(car (member rev (magit-list-remote-branch-names)))))
|
||||
|
||||
(defun magit-branch-set-face (branch)
|
||||
(propertize branch 'face (if (magit-local-branch-p branch)
|
||||
'magit-branch-local
|
||||
@ -1189,9 +1200,8 @@ Return a list of two integers: (A>B B>A)."
|
||||
(defmacro magit-with-temp-index (tree arg &rest body)
|
||||
(declare (indent 2) (debug (form form body)))
|
||||
(let ((file (cl-gensym "file")))
|
||||
`(let ((,file (magit-convert-git-filename
|
||||
`(let ((,file (magit-convert-filename-for-git
|
||||
(make-temp-name (magit-git-dir "index.magit.")))))
|
||||
(setq ,file (or (file-remote-p ,file 'localname) ,file))
|
||||
(unwind-protect
|
||||
(progn (--when-let ,tree
|
||||
(or (magit-git-success "read-tree" ,arg it
|
||||
@ -1,8 +1,8 @@
|
||||
(define-package "magit" "20160927.510" "A Git porcelain inside Emacs"
|
||||
(define-package "magit" "20161001.1454" "A Git porcelain inside Emacs"
|
||||
'((emacs "24.4")
|
||||
(async "20160711.223")
|
||||
(dash "20160820.501")
|
||||
(with-editor "20160812.1457")
|
||||
(with-editor "20160929.734")
|
||||
(git-commit "20160519.950")
|
||||
(magit-popup "20160813.642"))
|
||||
:url "https://github.com/magit/magit" :keywords
|
||||
@ -62,8 +62,7 @@ Then show the status buffer for the new repository."
|
||||
(match-string 1 url))))))
|
||||
(setq directory (file-name-as-directory (expand-file-name directory)))
|
||||
(magit-run-git-async "clone" repository
|
||||
;; Stop cygwin git making a "c:" directory.
|
||||
(magit-convert-git-filename directory))
|
||||
(magit-convert-filename-for-git directory))
|
||||
;; Don't refresh the buffer we're calling from.
|
||||
(process-put magit-this-process 'inhibit-refresh t)
|
||||
(set-process-sentinel
|
||||
@ -16,7 +16,7 @@
|
||||
;; Rémi Vanicat <vanicat@debian.org>
|
||||
;; Yann Hodique <yann.hodique@gmail.com>
|
||||
|
||||
;; Package-Requires: ((emacs "24.4") (async "20160711.223") (dash "20160820.501") (with-editor "20160812.1457") (git-commit "20160519.950") (magit-popup "20160813.642"))
|
||||
;; Package-Requires: ((emacs "24.4") (async "20160711.223") (dash "20160820.501") (with-editor "20160929.734") (git-commit "20160519.950") (magit-popup "20160813.642"))
|
||||
;; Keywords: git tools vc
|
||||
;; Homepage: https://github.com/magit/magit
|
||||
|
||||
@ -278,6 +278,53 @@ prefer the former, then you should add branches such as \"master\",
|
||||
:group 'magit-commands
|
||||
:type '(repeat string))
|
||||
|
||||
(defcustom magit-branch-adjust-remote-upstream-alist nil
|
||||
"Alist of upstreams to be used when branching from remote branches.
|
||||
|
||||
When creating a local branch from an ephemeral branch located
|
||||
on a remote, e.g. a feature or hotfix branch, then that remote
|
||||
branch should usually not be used as the upstream branch, since
|
||||
the push-remote already allows accessing it and having both the
|
||||
upstream and the push-remote reference the same related branch
|
||||
would be wasteful. Instead a branch like \"maint\" or \"master\"
|
||||
should be used as the upstream.
|
||||
|
||||
This option allows specifing the branch that should be used as
|
||||
the upstream when branching certain remote branches. The value
|
||||
is an alist of the form ((UPSTREAM . RULE)...). The first
|
||||
matching element is used, the following elements are ignored.
|
||||
|
||||
UPSTREAM is the branch to be used as the upstream for branches
|
||||
specified by RULE. It can be a local or a remote branch.
|
||||
|
||||
RULE can either be a regular expression, matching branches whose
|
||||
upstream should be the one specified by UPSTREAM. Or it can be
|
||||
a list of the only branches that should *not* use UPSTREAM; all
|
||||
other branches will. Matching is done after stripping the remote
|
||||
part of the name of the branch that is being branched from.
|
||||
|
||||
If you use a finite set of non-ephemeral branches across all your
|
||||
repositories, then you might use something like:
|
||||
|
||||
((\"origin/master\" \"master\" \"next\" \"maint\"))
|
||||
|
||||
Or if the names of all your ephemeral branches contain a slash,
|
||||
at least in some repositories, then a good value could be:
|
||||
|
||||
((\"origin/master\" . \"/\"))
|
||||
|
||||
Of course you can also fine-tune:
|
||||
|
||||
((\"origin/maint\" . \"\\`hotfix/\")
|
||||
(\"origin/master\" . \"\\`feature/\"))"
|
||||
:package-version '(magit . "2.9.0")
|
||||
:group 'magit-commands
|
||||
:type '(repeat (cons (string :tag "Use upstream")
|
||||
(choice :tag "for branches"
|
||||
(regexp :tag "matching")
|
||||
(repeat :tag "except"
|
||||
(string :tag "branch"))))))
|
||||
|
||||
(defcustom magit-branch-popup-show-variables t
|
||||
"Whether the `magit-branch-popup' shows Git variables.
|
||||
This defaults to t to avoid changing key bindings. When set to
|
||||
@ -672,7 +719,10 @@ detached `HEAD'."
|
||||
|
||||
(defun magit-insert-untracked-files ()
|
||||
"Maybe insert a list or tree of untracked files.
|
||||
Do so depending on the value of `status.showUntrackedFiles'."
|
||||
Do so depending on the value of `status.showUntrackedFiles'.
|
||||
Note that even if the value is `all', Magit still initially only
|
||||
shows directories. But the directory sections can then be expanded
|
||||
using \"TAB\"."
|
||||
(let ((show (or (magit-get "status.showUntrackedFiles") "normal")))
|
||||
(unless (equal show "no")
|
||||
(if (equal show "all")
|
||||
@ -823,7 +873,8 @@ Type \\[magit-reset] to reset HEAD to the commit at point.
|
||||
(?N "Not merged to master" "--no-merged=master"))
|
||||
:options '((?c "Contains" "--contains=" magit-read-branch-or-commit)
|
||||
(?m "Merged" "--merged=" magit-read-branch-or-commit)
|
||||
(?n "Not merged" "--no-merged=" magit-read-branch-or-commit))
|
||||
(?n "Not merged" "--no-merged=" magit-read-branch-or-commit)
|
||||
(?s "Sort" "--sort=" magit-read-ref-sort))
|
||||
:actions '((?y "Show refs, comparing them with HEAD"
|
||||
magit-show-refs-head)
|
||||
(?c "Show refs, comparing them with current branch"
|
||||
@ -833,6 +884,12 @@ Type \\[magit-reset] to reset HEAD to the commit at point.
|
||||
:default-action 'magit-show-refs-head
|
||||
:use-prefix 'popup)
|
||||
|
||||
(defun magit-read-ref-sort (prompt initial-input)
|
||||
(magit-completing-read prompt
|
||||
'("-committerdate" "-authordate"
|
||||
"committerdate" "authordate")
|
||||
nil nil initial-input))
|
||||
|
||||
;;;###autoload
|
||||
(defun magit-show-refs-head (&optional args)
|
||||
"List and compare references in a dedicated buffer.
|
||||
@ -1345,7 +1402,7 @@ Non-interactively DIRECTORY is (re-)initialized unconditionally."
|
||||
(user-error "Abort")))
|
||||
(list directory)))
|
||||
;; `git init' does not understand the meaning of "~"!
|
||||
(magit-call-git "init" (magit-convert-git-filename
|
||||
(magit-call-git "init" (magit-convert-filename-for-git
|
||||
(expand-file-name directory)))
|
||||
(magit-status-internal directory))
|
||||
|
||||
@ -1400,9 +1457,7 @@ changes.
|
||||
\n(git branch [ARGS] BRANCH START-POINT)."
|
||||
(interactive (magit-branch-read-args "Create branch"))
|
||||
(magit-call-git "branch" args branch start-point)
|
||||
(--when-let (and (magit-get-upstream-branch branch)
|
||||
(magit-get-indirect-upstream-branch start-point))
|
||||
(magit-call-git "branch" (concat "--set-upstream-to=" it) branch))
|
||||
(magit-branch-maybe-adjust-upstream branch start-point)
|
||||
(magit-refresh))
|
||||
|
||||
;;;###autoload
|
||||
@ -1413,11 +1468,21 @@ changes.
|
||||
(if (string-match-p "^stash@{[0-9]+}$" start-point)
|
||||
(magit-run-git "stash" "branch" branch start-point)
|
||||
(magit-call-git "checkout" args "-b" branch start-point)
|
||||
(--when-let (and (magit-get-upstream-branch branch)
|
||||
(magit-get-indirect-upstream-branch start-point))
|
||||
(magit-call-git "branch" (concat "--set-upstream-to=" it) branch))
|
||||
(magit-branch-maybe-adjust-upstream branch start-point)
|
||||
(magit-refresh)))
|
||||
|
||||
(defun magit-branch-maybe-adjust-upstream (branch start-point)
|
||||
(--when-let
|
||||
(or (and (magit-get-upstream-branch branch)
|
||||
(magit-get-indirect-upstream-branch start-point))
|
||||
(and (magit-remote-branch-p start-point)
|
||||
(let ((name (cdr (magit-split-branch-name start-point))))
|
||||
(car (--first (if (listp (cdr it))
|
||||
(not (member name (cdr it)))
|
||||
(string-match-p (cdr it) name))
|
||||
magit-branch-adjust-remote-upstream-alist)))))
|
||||
(magit-call-git "branch" (concat "--set-upstream-to=" it) branch)))
|
||||
|
||||
;;;###autoload
|
||||
(defun magit-branch-orphan (branch start-point &optional args)
|
||||
"Create and checkout an orphan BRANCH with contents from revision START-POINT.
|
||||
@ -1443,7 +1508,7 @@ changes.
|
||||
(list branch start args)))
|
||||
|
||||
;;;###autoload
|
||||
(defun magit-branch-spinoff (branch &rest args)
|
||||
(defun magit-branch-spinoff (branch &optional from &rest args)
|
||||
"Create new branch from the unpushed commits.
|
||||
|
||||
Create and checkout a new branch starting at and tracking the
|
||||
@ -1459,18 +1524,42 @@ If the current branch is a member of the value of option
|
||||
`magit-branch-prefer-remote-upstream' (which see), then the
|
||||
current branch will be used as the starting point as usual, but
|
||||
the upstream of the starting-point may be used as the upstream
|
||||
of the new branch, instead of the starting-point itself."
|
||||
of the new branch, instead of the starting-point itself.
|
||||
|
||||
If optional FROM is non-nil, then the source branch is reset to
|
||||
that commit, instead of to the last commit it shares with its
|
||||
upstream. Interactively, FROM is non-nil, when the region
|
||||
selects some commits, and among those commits, FROM it is the
|
||||
commit that is the fewest commits ahead of the source branch.
|
||||
|
||||
The commit at the other end of the selection actually does not
|
||||
matter, all commits between FROM and `HEAD' are moved to the new
|
||||
branch. If FROM is not reachable from `HEAD' or is reachable
|
||||
from the source branch's upstream, then an error is raised."
|
||||
(interactive (list (magit-read-string "Spin off branch")
|
||||
(car (last (magit-region-values 'commit)))
|
||||
(magit-branch-arguments)))
|
||||
(when (magit-branch-p branch)
|
||||
(user-error "Branch %s already exists" branch))
|
||||
(user-error "Cannot spin off %s. It already exists" branch))
|
||||
(-if-let (current (magit-get-current-branch))
|
||||
(let (tracked base)
|
||||
(let ((tracked (magit-get-upstream-branch current))
|
||||
base)
|
||||
(when from
|
||||
(unless (magit-rev-ancestor-p from current)
|
||||
(user-error "Cannot spin off %s. %s is not reachable from %s"
|
||||
branch from current))
|
||||
(when (and tracked
|
||||
(magit-rev-ancestor-p from tracked))
|
||||
(user-error "Cannot spin off %s. %s is ancestor of upstream %s"
|
||||
branch from tracked)))
|
||||
(magit-call-git "checkout" args "-b" branch current)
|
||||
(--when-let (magit-get-indirect-upstream-branch current)
|
||||
(magit-call-git "branch" "--set-upstream-to" it branch))
|
||||
(when (and (setq tracked (magit-get-upstream-branch current))
|
||||
(setq base (magit-git-string "merge-base" current tracked))
|
||||
(when (and tracked
|
||||
(setq base
|
||||
(if from
|
||||
(concat from "^")
|
||||
(magit-git-string "merge-base" current tracked)))
|
||||
(not (magit-rev-eq base current)))
|
||||
(magit-call-git "update-ref" "-m"
|
||||
(format "reset: moving to %s" base)
|
||||
@ -2518,6 +2607,56 @@ the current repository."
|
||||
(and (file-directory-p dir)
|
||||
(directory-files dir nil "^[^.]"))))
|
||||
|
||||
;;;; Config Files
|
||||
|
||||
(defun magit-find-git-config-file (filename &optional wildcards)
|
||||
"Edit a located in the current repository's git directory.
|
||||
|
||||
When \".git\", located at the root of the working tree, is a
|
||||
regular file, then that makes it cumbersome to open a file
|
||||
located in the actual git directory.
|
||||
|
||||
This command is like `find-file', except that it temporarily
|
||||
binds `default-directory' to the actual git directory, while
|
||||
reading the FILENAME."
|
||||
(interactive
|
||||
(let ((default-directory (magit-git-dir)))
|
||||
(find-file-read-args "Find file: "
|
||||
(confirm-nonexistent-file-or-buffer))))
|
||||
(find-file filename wildcards))
|
||||
|
||||
(defun magit-find-git-config-file-other-window (filename &optional wildcards)
|
||||
"Edit a located in the current repository's git directory, in another window.
|
||||
|
||||
When \".git\", located at the root of the working tree, is a
|
||||
regular file, then that makes it cumbersome to open a file
|
||||
located in the actual git directory.
|
||||
|
||||
This command is like `find-file-other-window', except that it
|
||||
temporarily binds `default-directory' to the actual git
|
||||
directory, while reading the FILENAME."
|
||||
(interactive
|
||||
(let ((default-directory (magit-git-dir)))
|
||||
(find-file-read-args "Find file in other window: "
|
||||
(confirm-nonexistent-file-or-buffer))))
|
||||
(find-file-other-window filename wildcards))
|
||||
|
||||
(defun magit-find-git-config-file-other-frame (filename &optional wildcards)
|
||||
"Edit a located in the current repository's git directory, in another frame.
|
||||
|
||||
When \".git\", located at the root of the working tree, is a
|
||||
regular file, then that makes it cumbersome to open a file
|
||||
located in the actual git directory.
|
||||
|
||||
This command is like `find-file-other-frame', except that it
|
||||
temporarily binds `default-directory' to the actual git
|
||||
directory, while reading the FILENAME."
|
||||
(interactive
|
||||
(let ((default-directory (magit-git-dir)))
|
||||
(find-file-read-args "Find file in other frame: "
|
||||
(confirm-nonexistent-file-or-buffer))))
|
||||
(find-file-other-frame filename wildcards))
|
||||
|
||||
;;;; File Mode
|
||||
|
||||
(defvar magit-file-mode-map
|
||||
177
elpa/magit-20161001.1454/magit.info
Normal file
177
elpa/magit-20161001.1454/magit.info
Normal file
@ -0,0 +1,177 @@
|
||||
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: 320085
|
||||
|
||||
Tag Table:
|
||||
(Indirect)
|
||||
Node: Top1222
|
||||
Node: Introduction6446
|
||||
Node: Installation11169
|
||||
Node: Updating from an older release11544
|
||||
Node: Installing from an Elpa archive13139
|
||||
Node: Installing from the Git repository14478
|
||||
Node: Post-installation tasks17325
|
||||
Node: Getting started18714
|
||||
Node: Interface concepts24443
|
||||
Node: Modes and Buffers24717
|
||||
Node: Switching Buffers26462
|
||||
Node: Naming Buffers31003
|
||||
Node: Quitting Windows33838
|
||||
Node: Automatic Refreshing of Magit Buffers35470
|
||||
Node: Automatic Saving of File-Visiting Buffers38238
|
||||
Node: Automatic Reverting of File-Visiting Buffers39423
|
||||
Node: Risk of Reverting Automatically44419
|
||||
Node: Sections46802
|
||||
Node: Section movement47743
|
||||
Node: Section visibility51670
|
||||
Node: Section hooks55261
|
||||
Node: Section types and values57542
|
||||
Node: Section options58812
|
||||
Node: Popup buffers and prefix commands59284
|
||||
Node: Completion and confirmation60598
|
||||
Node: Running Git63504
|
||||
Node: Viewing Git output63740
|
||||
Node: Running Git manually64740
|
||||
Node: Git executable66866
|
||||
Node: Global Git arguments68873
|
||||
Node: Inspecting69680
|
||||
Node: Status buffer70827
|
||||
Node: Status sections73692
|
||||
Node: Status header sections79571
|
||||
Node: Status options82128
|
||||
Node: Repository list82852
|
||||
Node: Logging85010
|
||||
Node: Refreshing logs87748
|
||||
Node: Log Buffer89133
|
||||
Node: Select from log92429
|
||||
Node: Reflog93369
|
||||
Node: Diffing93847
|
||||
Node: Refreshing diffs96867
|
||||
Node: Diff buffer99848
|
||||
Node: Diff options101750
|
||||
Node: Revision buffer105050
|
||||
Node: Ediffing106005
|
||||
Node: References buffer109595
|
||||
Node: References sections114305
|
||||
Node: Bisecting115180
|
||||
Node: Visiting blobs116919
|
||||
Node: Blaming117428
|
||||
Node: Manipulating120858
|
||||
Node: Repository setup121174
|
||||
Node: Staging and unstaging122214
|
||||
Node: Staging from file-visiting buffers126303
|
||||
Node: Applying127471
|
||||
Node: Committing129364
|
||||
Node: Initiating a commit129947
|
||||
Node: Editing commit messages133259
|
||||
Node: Branching143655
|
||||
Node: The two remotes143855
|
||||
Node: The branch popup146399
|
||||
Node: The branch config popup155100
|
||||
Node: Merging161006
|
||||
Node: Resolving conflicts163174
|
||||
Ref: orgradiotarget1164259
|
||||
Node: Rebasing168131
|
||||
Node: Editing rebase sequences171772
|
||||
Node: Information about in-progress rebase174802
|
||||
Ref: Information about in-progress rebase-Footnote-1181638
|
||||
Node: Cherry picking182224
|
||||
Node: Reverting183830
|
||||
Node: Resetting185193
|
||||
Node: Stashing186705
|
||||
Node: Transferring189879
|
||||
Node: Remotes190117
|
||||
Node: Fetching191403
|
||||
Node: Pulling192769
|
||||
Node: Pushing193615
|
||||
Node: Creating and sending patches198359
|
||||
Node: Applying patches199054
|
||||
Node: Miscellaneous200052
|
||||
Node: Tagging200355
|
||||
Node: Notes201140
|
||||
Node: Submodules203665
|
||||
Node: Listing submodules203880
|
||||
Node: Submodule popup205699
|
||||
Node: Subtree206982
|
||||
Node: Common commands208230
|
||||
Node: Wip modes209975
|
||||
Node: Minor mode for buffers visiting files216711
|
||||
Node: Minor mode for buffers visiting blobs220185
|
||||
Node: Customizing220990
|
||||
Node: Per-repository configuration222662
|
||||
Node: Essential settings224296
|
||||
Node: Safety224620
|
||||
Node: Performance226453
|
||||
Node: Plumbing234415
|
||||
Node: Calling Git235239
|
||||
Node: Getting a value from Git236762
|
||||
Node: Calling Git for effect239866
|
||||
Node: Section plumbing246370
|
||||
Node: Creating sections246598
|
||||
Node: Section selection250497
|
||||
Node: Matching sections252177
|
||||
Node: Refreshing buffers257386
|
||||
Node: Conventions260521
|
||||
Node: Confirmation and completion260698
|
||||
Node: Theming Faces261596
|
||||
Node: FAQ269747
|
||||
Node: Magit is slow271360
|
||||
Node: I changed several thousand files at once and now Magit is unusable271561
|
||||
Node: I am having problems committing272277
|
||||
Node: Diffs are collapsed after un-/staging272723
|
||||
Node: I don't understand how branching and pushing work274201
|
||||
Node: I don't like the key binding in v24274576
|
||||
Node: I cannot install the pre-requisites for Magit v2274915
|
||||
Node: I am using an Emacs release older than v244275380
|
||||
Node: I am using a Git release older than v194276993
|
||||
Node: I am using MS Windows and cannot push with Magit277980
|
||||
Node: I am using OS X and SOMETHING works in shell but not in Magit278584
|
||||
Node: How to install the gitman info manual?279375
|
||||
Node: How can I show Git's output?281916
|
||||
Node: Diffs contain control sequences282703
|
||||
Node: Expanding a file to show the diff causes it to disappear283708
|
||||
Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer284243
|
||||
Node: The mode-line information isn't always up-to-date285273
|
||||
Node: Can Magit be used as ‘ediff-version-control-package’?286341
|
||||
Node: How to show diffs for gpg-encrypted files?288385
|
||||
Node: Emacs 245 hangs when loading Magit288982
|
||||
Node: Symbol's value as function is void ‘--some’289557
|
||||
Node: Where is the branch manager289891
|
||||
Node: Keystroke Index290182
|
||||
Node: Command Index320085
|
||||
Node: Function Index350094
|
||||
Node: Variable Index363988
|
||||
|
||||
End Tag Table
|
||||
|
||||
|
||||
Local Variables:
|
||||
coding: utf-8
|
||||
End:
|
||||
@ -1957,8 +1957,12 @@ default the following functions are also members of that hook:
|
||||
|
||||
-- Function: magit-insert-untracked-files
|
||||
|
||||
Maybe insert a list or tree of untracked files. Do so depending on
|
||||
the value of ‘status.showUntrackedFiles’.
|
||||
Maybe insert a list or tree of untracked files.
|
||||
|
||||
Do so depending on the value of ‘status.showUntrackedFiles’. Note
|
||||
that even if the value is ‘all’, Magit still initially only shows
|
||||
directories. But the directory sections can then be expanded using
|
||||
‘TAB’.
|
||||
|
||||
-- Function: magit-insert-unstaged-changes
|
||||
|
||||
@ -2770,6 +2774,39 @@ File: magit.info, Node: Diff options, Next: Revision buffer, Prev: Diff buffe
|
||||
|
||||
Whether to hide ^M characters at the end of a line in diffs.
|
||||
|
||||
-- User Option: magit-diff-highlight-hunk-region-functions
|
||||
|
||||
This option specifies the functions used to highlight the
|
||||
hunk-internal region.
|
||||
|
||||
‘magit-diff-highlight-hunk-region-dim-outside’ overlays the outside
|
||||
of the hunk internal selection with a face that causes the added
|
||||
and removed lines to have the same background color as context
|
||||
lines. This function should not be removed from the value of this
|
||||
option.
|
||||
|
||||
‘magit-diff-highlight-hunk-region-using-overlays’ and
|
||||
‘magit-diff-highlight-hunk-region-using-underline’ emphasize the
|
||||
region by placing delimiting horizonal lines before and after it.
|
||||
Which implementation is preferable depends on the Emacs version,
|
||||
and the more suitable one is part of the default value.
|
||||
|
||||
Instead of, or in addition to, using delimiting horizontal lines,
|
||||
to emphasize the boundaries, you may which to emphasize the text
|
||||
itself, using ‘magit-diff-highlight-hunk-region-using-face’.
|
||||
|
||||
In terminal frames it’s not possible to draw lines as the overlay
|
||||
and underline variants normally do, so there they fall back to
|
||||
calling the face function instead.
|
||||
|
||||
-- User Option: magit-diff-unmarked-lines-keep-foreground
|
||||
|
||||
This option controls whether added and removed lines outside the
|
||||
hunk-internal region only lose their distinct background color or
|
||||
also the foreground color. Whether the outside of the region is
|
||||
dimmed at all depends on
|
||||
‘magit-diff-highlight-hunk-region-functions’.
|
||||
|
||||
|
||||
File: magit.info, Node: Revision buffer, Prev: Diff options, Up: Diffing
|
||||
|
||||
@ -3964,6 +4001,17 @@ features are available from separate popups.
|
||||
upstream of the starting-point may be used as the upstream of the
|
||||
new branch, instead of the starting-point itself.
|
||||
|
||||
If optional FROM is non-nil, then the source branch is reset to
|
||||
that commit, instead of to the last commit it shares with its
|
||||
upstream. Interactively, FROM is non-nil, when the region selects
|
||||
some commits, and among those commits, FROM it is the commit that
|
||||
is the fewest commits ahead of the source branch.
|
||||
|
||||
The commit at the other end of the selection actually does not
|
||||
matter, all commits between FROM and ‘HEAD’ are moved to the new
|
||||
branch. If FROM is not reachable from ‘HEAD’ or is reachable from
|
||||
the source branch’s upstream, then an error is raised.
|
||||
|
||||
‘b x’ (‘magit-branch-reset’)
|
||||
|
||||
This command resets a branch, defaulting to the branch at point, to
|
||||
@ -4036,6 +4084,48 @@ features are available from separate popups.
|
||||
prefer the former, then you should add branches such as ‘master’,
|
||||
‘next’, and ‘maint’ to the value of this options.
|
||||
|
||||
-- User Option: magit-branch-adjust-remote-upstream-alist
|
||||
|
||||
The value of this option is an alist of branches to be used as the
|
||||
upstream when branching a remote branch.
|
||||
|
||||
When creating a local branch from an ephemeral branch located on a
|
||||
remote, e.g. a feature or hotfix branch, then that remote branch
|
||||
should usually not be used as the upstream branch, since the
|
||||
push-remote already allows accessing it and having both the
|
||||
upstream and the push-remote reference the same related branch
|
||||
would be wasteful. Instead a branch like "maint" or "master"
|
||||
should be used as the upstream.
|
||||
|
||||
This option allows specifing the branch that should be used as the
|
||||
upstream when branching certain remote branches. The value is an
|
||||
alist of the form ‘((UPSTREAM . RULE)...)’. The first matching
|
||||
element is used, the following elements are ignored.
|
||||
|
||||
UPSTREAM is the branch to be used as the upstream for branches
|
||||
specified by RULE. It can be a local or a remote branch.
|
||||
|
||||
RULE can either be a regular expression, matching branches whose
|
||||
upstream should be the one specified by UPSTREAM. Or it can be a
|
||||
list of the only branches that should *not* use UPSTREAM; all other
|
||||
branches will. Matching is done after stripping the remote part of
|
||||
the name of the branch that is being branched from.
|
||||
|
||||
If you use a finite set of non-ephemeral branches across all your
|
||||
repositories, then you might use something like:
|
||||
|
||||
(("origin/master" "master" "next" "maint"))
|
||||
|
||||
Or if the names of all your ephemeral branches contain a slash, at
|
||||
least in some repositories, then a good value could be:
|
||||
|
||||
(("origin/master" . "/"))
|
||||
|
||||
Of course you can also fine-tune:
|
||||
|
||||
(("origin/maint" . "\\`hotfix/")
|
||||
("origin/master" . "\\`feature/"))
|
||||
|
||||
-- Command: magit-branch-orphan
|
||||
|
||||
This command creates and checks out a new orphan branch with
|
||||
@ -7447,14 +7537,14 @@ Appendix B Keystroke Index
|
||||
* b c: The branch popup. (line 47)
|
||||
* B g: Bisecting. (line 36)
|
||||
* B k: Bisecting. (line 41)
|
||||
* b k: The branch popup. (line 88)
|
||||
* b k: The branch popup. (line 99)
|
||||
* b n: The branch popup. (line 37)
|
||||
* B r: Bisecting. (line 47)
|
||||
* b r: The branch popup. (line 94)
|
||||
* b r: The branch popup. (line 105)
|
||||
* B s: Bisecting. (line 16)
|
||||
* b s: The branch popup. (line 54)
|
||||
* B u: Bisecting. (line 24)
|
||||
* b x: The branch popup. (line 71)
|
||||
* b x: The branch popup. (line 82)
|
||||
* c: Initiating a commit. (line 8)
|
||||
* c <1>: Editing rebase sequences.
|
||||
(line 72)
|
||||
Binary file not shown.
@ -4,8 +4,8 @@
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil nil ("magithub-cache.el" "magithub-ci.el" "magithub-core.el"
|
||||
;;;;;; "magithub-issue.el" "magithub-pkg.el" "magithub.el") (22508
|
||||
;;;;;; 49897 853964 203000))
|
||||
;;;;;; "magithub-issue.el" "magithub-pkg.el" "magithub.el") (22514
|
||||
;;;;;; 17666 568709 294000))
|
||||
|
||||
;;;***
|
||||
|
||||
@ -27,11 +27,10 @@
|
||||
(require 'magit)
|
||||
|
||||
(defun magithub-github-repository-p ()
|
||||
"Non-nil if \"origin\" points to GitHub."
|
||||
"Non-nil if \"origin\" points to GitHub or a whitelisted domain."
|
||||
(let ((url (magit-get "remote" "origin" "url")))
|
||||
(or (s-prefix? "git@github.com:" url)
|
||||
(s-prefix? "https://github.com/" url)
|
||||
(s-prefix? "git://github.com/" url))))
|
||||
(cl-some (lambda (domain) (s-contains? domain url))
|
||||
(cons "github.com" (magit-get-all "hub" "host")))))
|
||||
|
||||
(defun magithub-repo-id ()
|
||||
"Returns an identifying value for this repository."
|
||||
@ -123,11 +123,17 @@ Returns a plist with the following properties:
|
||||
(when issue
|
||||
(magit-insert-section (magithub-issue issue)
|
||||
(let ((formats (or magithub-issue-format
|
||||
(list :number " %3d " :title " %s "))))
|
||||
(list :number " %3d " :title " %s ")))
|
||||
s)
|
||||
(while formats
|
||||
(let ((key (car formats)) (fmt (cadr formats)))
|
||||
(insert (format fmt (plist-get issue key))))
|
||||
(setq formats (cddr formats))))
|
||||
(setq s (concat s (format fmt (plist-get issue key)))))
|
||||
(setq formats (cddr formats)))
|
||||
(insert
|
||||
(propertize
|
||||
s 'face
|
||||
(when (eq (plist-get issue :type) 'pull-request)
|
||||
'magit-branch-remote))))
|
||||
(insert ?\n))))
|
||||
|
||||
(defun magithub-issue-browse (issue)
|
||||
@ -172,7 +178,18 @@ If `issue' is nil, open the repository's issues page."
|
||||
(insert " No issues.\n"))))))
|
||||
|
||||
;;; Hook into the status buffer
|
||||
(add-hook 'magit-status-sections-hook #'magithub-issue--insert-section t)
|
||||
(defun magithub-toggle-issues ()
|
||||
(interactive)
|
||||
(if (memq #'magithub-issue--insert-section magit-status-sections-hook)
|
||||
(remove-hook 'magit-status-sections-hook #'magithub-issue--insert-section)
|
||||
(if (executable-find magithub-hub-executable)
|
||||
(add-hook ' magit-status-sections-hook #'magithub-issue--insert-section t)
|
||||
(message "Magithub: (magithub-toggle-issues) `hub' isn't installed, so I can't insert issues")))
|
||||
(when (derived-mode-p 'magit-status-mode)
|
||||
(magit-refresh))
|
||||
(memq #'magithub-issue--insert-section magit-status-sections-hook))
|
||||
|
||||
(magithub-toggle-issues)
|
||||
|
||||
(provide 'magithub-issue)
|
||||
;;; magithub-issue.el ends here
|
||||
@ -1,4 +1,4 @@
|
||||
(define-package "magithub" "20160928.1650" "Magit interfaces for GitHub"
|
||||
(define-package "magithub" "20160930.1523" "Magit interfaces for GitHub"
|
||||
'((emacs "24.3")
|
||||
(magit "2.8.0")
|
||||
(git-commit "20160821.1338")
|
||||
@ -204,5 +204,33 @@ This function will return nil for matches to
|
||||
(magithub-setup-new-issue-buffer)))))
|
||||
(add-hook 'find-file-hook #'magithub-check-buffer)
|
||||
|
||||
(defun magithub-clone--get-repo ()
|
||||
"Prompt for a user and a repository.
|
||||
Returns a list (USER REPOSITORY)."
|
||||
(let ((user (getenv "GITHUB_USER"))
|
||||
(repo-regexp (rx bos (group (+ (not (any " "))))
|
||||
"/" (group (+ (not (any " ")))) eos))
|
||||
repo)
|
||||
(while (not (and repo (string-match repo-regexp repo)))
|
||||
(setq repo (read-from-minibuffer
|
||||
(concat
|
||||
"Clone GitHub repository "
|
||||
(if repo "(format is \"user/repo\"; C-g to quit)" "(user/repo)")
|
||||
": ")
|
||||
(when user (concat user "/")))))
|
||||
(list (match-string 1 repo)
|
||||
(match-string 2 repo))))
|
||||
|
||||
(defun magithub-clone (user repo)
|
||||
"Clone USER/REPO.
|
||||
Banned inside existing GitHub repositories."
|
||||
(interactive (if (magithub-github-repository-p)
|
||||
(user-error "Already in a GitHub repo")
|
||||
(magithub-clone--get-repo)))
|
||||
(async-shell-command
|
||||
(format "%s clone %s/%s"
|
||||
magithub-hub-executable
|
||||
user repo)))
|
||||
|
||||
(provide 'magithub)
|
||||
;;; magithub.el ends here
|
||||
@ -1,3 +0,0 @@
|
||||
(define-package "org"
|
||||
"20160926" "Outline-based notes management and organizer" ( ))
|
||||
;; no-byte-compile: t
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user