gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Magit now compiles cleanly.Fix for appending an explicit number of new log entries.

Browse source
This commit is contained in:
Roger Crew 2010-04-25 19:22:33 +01:00 committed by Phil Jackson
parent 1701272fce
commit 4c2e7ee5e9
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
magit.el
View file

@ -274,8 +274,16 @@ Many Magit faces inherit from this one by default."
(declare (indent 0)) (declare (indent 0))
`(magit-refresh-wrapper (lambda () ,@body))) `(magit-refresh-wrapper (lambda () ,@body)))
(eval-when-compile
(when (< emacs-major-version 23)
(defvar line-move-visual nil)))
;;; Utilities ;;; Utilities
(defvar magit-submode nil)
(make-variable-buffer-local 'magit-submode)
(put 'magit-submode 'permanent-local t)
(defun magit-use-region-p () (defun magit-use-region-p ()
(if (fboundp 'use-region-p) (if (fboundp 'use-region-p)
(use-region-p) (use-region-p)
@ -1561,10 +1569,6 @@ FUNC should leave point at the end of the modified region"
(put 'magit-mode 'mode-class 'special) (put 'magit-mode 'mode-class 'special)
(defvar magit-submode nil)
(make-variable-buffer-local 'magit-submode)
(put 'magit-submode 'permanent-local t)
(defvar magit-refresh-function nil) (defvar magit-refresh-function nil)
(make-variable-buffer-local 'magit-refresh-function) (make-variable-buffer-local 'magit-refresh-function)
(put 'magit-refresh-function 'permanent-local t) (put 'magit-refresh-function 'permanent-local t)
@ -2559,9 +2563,9 @@ Given a prefix-arg then the merge will be squashed."
(defun magit-svn-find-rev (rev &optional branch) (defun magit-svn-find-rev (rev &optional branch)
(interactive (interactive
(list (read-input "SVN revision: ") (list (read-string "SVN revision: ")
(if current-prefix-arg (if current-prefix-arg
(read-input "In branch: ")))) (read-string "In branch: "))))
(let* ((sha (apply 'magit-git-string (let* ((sha (apply 'magit-git-string
`("svn" `("svn"
"find-rev" "find-rev"
@ -2820,6 +2824,8 @@ If USE-CACHE is non nil, use the cached information."
(magit-set merge-branch "branch" branch "merge")) (magit-set merge-branch "branch" branch "merge"))
(magit-run-git-async "pull" "-v"))) (magit-run-git-async "pull" "-v")))
(eval-when-compile (require 'pcomplete))
(defun magit-shell-command (command) (defun magit-shell-command (command)
(interactive "sCommand: ") (interactive "sCommand: ")
(require 'pcomplete) (require 'pcomplete)
@ -3702,9 +3708,12 @@ With a non numeric prefix ARG, show all entries"
(kill-new info) (kill-new info)
(message "%s" info)))) (message "%s" info))))
(eval-when-compile (require 'server))
(defun magit-interactive-rebase () (defun magit-interactive-rebase ()
"Start a git rebase -i session, old school-style." "Start a git rebase -i session, old school-style."
(interactive) (interactive)
(require 'server)
(unless (server-running-p) (unless (server-running-p)
(server-start)) (server-start))
(let* ((section (get-text-property (point) 'magit-section)) (let* ((section (get-text-property (point) 'magit-section))
@ -3847,7 +3856,10 @@ With prefix force the removal even it it hasn't been merged."
(defvar magit-ediff-file) (defvar magit-ediff-file)
(defvar magit-ediff-windows) (defvar magit-ediff-windows)
(eval-when-compile (require 'ediff))
(defun magit-interactive-resolve (file) (defun magit-interactive-resolve (file)
(require 'ediff)
(let ((merge-status (magit-git-string "ls-files" "-u" "--" file)) (let ((merge-status (magit-git-string "ls-files" "-u" "--" file))
(base-buffer (generate-new-buffer (concat file ".base"))) (base-buffer (generate-new-buffer (concat file ".base")))
(our-buffer (generate-new-buffer (concat file ".current"))) (our-buffer (generate-new-buffer (concat file ".current")))