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

Timestamp:

07/01/06 08:27:06 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

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

trunk/lisp/diff-mode.el

@@ -439 +439 @@
-                      (goto-char start)
-                      (diff-beginning-of-file) (diff-hunk-next) (point)))
-
+
+
-    (goto-char start)
-    (if (and firsthunk (= firsthunk start)
@@ -458 +459 @@
-                       (diff-hunk-prev) (point))))
-         (index (save-excursion
-
+
+
-    (when index (setq start index))
-    (diff-end-of-file)
@@ -498 +500 @@
-           (start2 (string-to-number (match-string 2)))
-           (newstart1 (+ start1 (diff-count-matches "^[- \t]" (point) pos)))
-
+
+
-      (goto-char pos)
-      ;; Hopefully the after-change-function will not screw us over.
@@ -994 +997 @@
-  (set (make-local-variable 'next-error-function) 'diff-next-error)
-
-
-
+
-  ;; setup change hooks
-  (if (not diff-update-on-the-fly)
@@ -1356 +1358 @@
-         (file2 (make-temp-file "diff2"))
-         (coding-system-for-read buffer-file-coding-system)
+         (inhibit-read-only t)
-         old new)
-    (unwind-protect