Changeset 4111 for trunk/lisp/diff-mode.el

Timestamp:

2006年07月16日 08時36分52秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/diff-mode.el (modified) (11 diffs)

trunk/lisp/diff-mode.el

@@ -47 +47 @@
-;;   possible to apply them to <file>, <hunk-src>, or <hunk-dst>.
-;;   Or maybe just make it into a ".rej to diff3-markers converter".
+;;   Maybe just use `wiggle' (by Neil Brown) to do it for us.
-;;
-;; - Refine hunk on a word-by-word basis.
-
+
+
+
-;; - Handle `diff -b' output in context->unified.
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-
@@ -129 +131 @@
-    ;;("j" . diff-show-difference)      ;jump to Nth diff
-    ;;("q" . diff-quit)
-
-;;    
-;;    
-
-;;    
-
-;;    
-;;    
+    
+    ;;
+    ;;
+    
+    ;;
+    
+    ;;
+    ;;
-    ("q" . quit-window))
-  "Basic keymap for `diff-mode', bound to various prefix keys.")
@@ -582 +584 @@
-                     (if old (match-string 4) (match-string 2)))))))))
-
-
+ prefix
-  "Return the file corresponding to the current patch.
-
+
+
-  (save-excursion
-    (unless (looking-at diff-file-header-re)
@@ -590 +593 @@
-          (re-search-forward diff-file-header-re nil t)))
-    (let ((fs (diff-hunk-file-names old)))
+      (if prefix (setq fs (mapcar (lambda (f) (concat prefix f)) fs)))
-      (or
-       ;; use any previously used preference
@@ -611 +615 @@
-            (let ((file (substring buffer-file-name 0 (match-beginning 0))))
-              (when (file-exists-p file) file)))
+       ;; If we haven't found the file, maybe it's because we haven't paid
+       ;; attention to the PCL-CVS hint.
+       (and (not prefix)
+            (boundp 'cvs-pcl-cvs-dirchange-re)
+            (save-excursion
+              (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
+            (diff-find-file-name old (match-string 1)))
-       ;; if all else fails, ask the user
-       (let ((file (read-file-name (format "Use file %s: " (or (first fs) ""))
@@ -640 +651 @@
-                   (list (region-beginning) (region-end))
-                 (list (point-min) (point-max))))
-
+ t
-  (let (;;(diff-inhibit-after-change t)
-        (inhibit-read-only t))
@@ -730 +741 @@
-  (if to-context
-      (diff-unified->context start end)
-
+ t
-    (let ( ;;(diff-inhibit-after-change t)
-          (inhibit-read-only t))
@@ -802 +813 @@
-                   (list (region-beginning) (region-end))
-                 (list (point-min) (point-max))))
-
+ t
-  (let (;;(diff-inhibit-after-change t)
-        (inhibit-read-only t))
@@ -980 +991 @@
-You can also switch between context diff and unified diff with \\[diff-context->unified],
-or vice versa with \\[diff-unified->context] and you can also reverse the direction of
-
+
+
-  (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
-  (set (make-local-variable 'outline-regexp) diff-outline-regexp)
@@ -1005 +1017 @@
-    (add-hook 'post-command-hook 'diff-post-command-hook nil t))
-  ;; Neat trick from Dave Love to add more bindings in read-only mode:
-
+xical-le
-    (add-to-list 'minor-mode-overriding-map-alist ro-bind)
-    ;; Turn off this little trick in case the buffer is put in view-mode.
-    (add-hook 'view-mode-hook
-`
- 
- (delq ',
+
+
+(delq 
-              nil t))
-  ;; add-log support
@@ -1032 +1044 @@
-    (add-hook 'post-command-hook 'diff-post-command-hook nil t)))
-
-;;
+
-
-(defun diff-delete-if-empty ()