[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/diff-mode.el
From: |
Lute Kamstra |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/diff-mode.el |
Date: |
Mon, 04 Apr 2005 04:54:59 -0400 |
Index: emacs/lisp/diff-mode.el
diff -c emacs/lisp/diff-mode.el:1.69 emacs/lisp/diff-mode.el:1.70
*** emacs/lisp/diff-mode.el:1.69 Sun Oct 10 04:08:43 2004
--- emacs/lisp/diff-mode.el Mon Apr 4 08:54:58 2005
***************
*** 1,7 ****
;;; diff-mode.el --- a mode for viewing/editing context diffs
! ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
! ;; Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: convenience patch diff
--- 1,7 ----
;;; diff-mode.el --- a mode for viewing/editing context diffs
! ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
! ;; Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: convenience patch diff
***************
*** 263,269 ****
(save-excursion
(while (re-search-backward re start t)
(replace-match "" t t)))))))
!
(defvar diff-font-lock-keywords
`(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
--- 263,269 ----
(save-excursion
(while (re-search-backward re start t)
(replace-match "" t t)))))))
!
(defvar diff-font-lock-keywords
`(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
***************
*** 484,490 ****
(let ((fs (diff-hunk-file-names old)))
(unless fs (error "No file name to look for"))
(push (cons fs name) diff-remembered-files-alist)))
!
(defun diff-hunk-file-names (&optional old)
"Give the list of file names textually mentioned for the current hunk."
(save-excursion
--- 484,490 ----
(let ((fs (diff-hunk-file-names old)))
(unless fs (error "No file name to look for"))
(push (cons fs name) diff-remembered-files-alist)))
!
(defun diff-hunk-file-names (&optional old)
"Give the list of file names textually mentioned for the current hunk."
(save-excursion
***************
*** 952,958 ****
(define-minor-mode diff-minor-mode
"Minor mode for viewing/editing context diffs.
\\{diff-minor-mode-map}"
! nil " Diff" nil
;; FIXME: setup font-lock
;; setup change hooks
(if (not diff-update-on-the-fly)
--- 952,958 ----
(define-minor-mode diff-minor-mode
"Minor mode for viewing/editing context diffs.
\\{diff-minor-mode-map}"
! :group 'diff-mode :lighter " Diff"
;; FIXME: setup font-lock
;; setup change hooks
(if (not diff-update-on-the-fly)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/diff-mode.el,
Lute Kamstra <=