Changeset 4098 for trunk/lisp/diff.el

Timestamp:

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

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/diff.el (modified) (4 diffs)

trunk/lisp/diff.el

@@ -68 +68 @@
-  (save-excursion
-    (goto-char (point-max))
-
-
-
+
+
+
+
-
-;;;###autoload
@@ -120 +121 @@
-      (setq buffer-read-only nil)
-      (buffer-disable-undo (current-buffer))
-
+
+
-      (buffer-enable-undo (current-buffer))
-      (diff-mode)
@@ -129 +131 @@
-      (set (make-local-variable 'diff-new-temp-file) new-alt)
-      (setq default-directory thisdir)
-
+
+
-      (if (and (not no-async) (fboundp 'start-process))
-          (progn
-            (setq proc (start-process "Diff" buf shell-file-name
-                                      shell-command-switch command))
+            (set-process-filter proc 'diff-process-filter)
-            (set-process-sentinel
-             proc (lambda (proc msg)
@@ -139 +143 @@
-                      (diff-sentinel (process-exit-status proc))))))
-        ;; Async processes aren't available.
-
-
-
+
+
+
+
-    buf))
+
+(defun diff-process-filter (proc string)
+  (with-current-buffer (process-buffer proc)
+    (let ((moving (= (point) (process-mark proc))))
+      (save-excursion
+        ;; Insert the text, advancing the process marker.
+        (goto-char (process-mark proc))
+        (let ((inhibit-read-only t))
+          (insert string))
+        (set-marker (process-mark proc) (point)))
+      (if moving (goto-char (process-mark proc))))))
-
-;;;###autoload