emacs: lisp/diff.el comparison

comparison lisp/diff.el @ 474:c3bbd755b7da

*** empty log message ***

author	Jim Blandy <jimb@redhat.com>
date	Sat, 21 Dec 1991 09:14:03 +0000
parents	feacf757c5b2
children	8a533acedb77

comparison

equal deleted inserted replaced

-:999d0b38694e
+:c3bbd755b7da
 ;;  "Function to return switches to pass to the `diff' utility, in \\[diff].
 ;; This function is called with one arg, a file name, and returns a string
 ;; containing 0 or more arguments which are passed on to `diff'.
 ;; NOTE: This is not an ordinary hook; it may not be a list of functions.")
+;;  - fpb@ittc.wec.com - Sep 25, 1990
+;; Added code to support sccs diffing.
+;; also fixed one minor glitch in the
+;; search for the pattern.  If you only 1 addition you won't find the end
+;; of the pattern (minor)
+;;
 (defvar diff-switches nil
 "*A list of switches to pass to the diff program.")
 (defvar diff-search-pattern "^\\([0-9]\\|\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\)"
 "Regular expression that delineates difference regions in diffs.")
+(defvar diff-rcs-extension ",v"
+"*Extension to find RCS file, some systems do not use ,v")
 ;; Initialize the keymap if it isn't already
 (if (boundp 'diff-mode-map)
 nil
 (setq diff-mode-map (make-keymap))
 			(read-file-name "Diff original file: "
 					(file-name-directory newf) nil t)))))))
 (message "Comparing files %s %s..." new old)
 (setq new (expand-file-name new)
 	old (expand-file-name old))
-(let ((buffer-read-only nil)
+(diff-internal-diff "diff" (append diff-switches (list new old)) nil))
-	(sw diff-switches))
+(defun diff-sccs (new)
+"Find and display the differences between OLD and SCCS files."
+(interactive
+(let (newf)
+(list
+(setq newf (buffer-file-name)
+	     newf (if (and newf (file-exists-p newf))
+			  (read-file-name
+			   (concat "Diff new file: ("
+				   (file-name-nondirectory newf) ") ")
+			   nil newf t)
+			(read-file-name "Diff new file: " nil nil t))))))
+(message "Comparing SCCS file %s..." new)
+(setq new (expand-file-name new))
+(if (file-exists-p (concat
+		      (file-name-directory new)
+		      "SCCS/s."
+		      (file-name-nondirectory new)))
+(diff-internal-diff "sccs"
+			  (append '("diffs") diff-switches (list new))
+			  2)
+(error "%s does not exist"
+	   (concat (file-name-directory new) "SCCS/s."
+		   (file-name-nondirectory new)))))
+(defun diff-rcs (new)
+"Find and display the differences between OLD and RCS files."
+(interactive
+(let (newf)
+(list
+(setq newf (buffer-file-name)
+	     newf (if (and newf (file-exists-p newf))
+			  (read-file-name
+			   (concat "Diff new file: ("
+				   (file-name-nondirectory newf) ") ")
+			   nil newf t)
+			(read-file-name "Diff new file: " nil nil t))))))
+(message "Comparing RCS file %s..." new)
+(let* ((fullname (expand-file-name new))
+(rcsfile (concat (file-name-directory fullname)
+"RCS/"
+(file-name-nondirectory fullname)
+diff-rcs-extension)))
+(if (file-exists-p rcsfile)
+(diff-internal-diff "rcsdiff" (append diff-switches (list fullname)) 4)
+(error "%s does not exist" rcsfile))))
+(defun diff-internal-diff (diff-command sw strip)
+(let ((buffer-read-only nil))
 (with-output-to-temp-buffer "*Diff Output*"
 (buffer-disable-undo standard-output)
 (save-excursion
 	(set-buffer standard-output)
 	(erase-buffer)
-	(apply 'call-process "diff" nil t nil
+	(apply 'call-process diff-command nil t nil sw)))
-	       (append diff-switches (list old new)))))
 (set-buffer "*Diff Output*")
 (goto-char (point-min))
 (while sw
 (if (string= (car sw) "-c")
 	  ;; strip leading filenames from context diffs
 	  (progn (forward-line 2) (delete-region (point-min) (point))))
-(setq sw (cdr sw))))
+(if (and (string= (car sw) "-C") (string= "sccs" diff-command))
+	  ;; strip stuff from SCCS context diffs
+	  (progn (forward-line 2) (delete-region (point-min) (point))))
+(setq sw (cdr sw)))
+(if strip
+	;; strip stuff from SCCS context diffs
+	(progn (forward-line strip) (delete-region (point-min) (point)))))
 (diff-mode)
 (if (string= "0" diff-total-differences)
 (let ((buffer-read-only nil))
 	(insert (message "There are no differences.")))
 (narrow-to-region (point) (progn
 						       nil t)
 				    (goto-char (match-beginning 0))
 				  (goto-char (point-max)))))
 (setq diff-current-difference "1")))
 ;; Take a buffer full of Unix diff output and go into a mode to easily
 ;; see the next and previous difference
 (defun diff-mode ()
 "Diff Mode is used by \\[diff] for perusing the output from the diff program.
 All normal editing commands are turned off.  Instead, these are available:
 \\<diff-mode-map>
 (make-local-variable 'diff-current-difference)
 (set (make-local-variable 'diff-total-differences)
 (int-to-string (diff-count-differences))))
 (defun diff-next-difference (n)
-"In diff mode, go to the beginning of the next difference as delimited
+"Go to the beginning of the next difference.
-by `diff-search-pattern'."
+Differences are delimited by `diff-search-pattern'."
 (interactive "p")
 (if (< n 0) (diff-previous-difference (- n))
 (if (zerop n) ()
 (goto-char (point-min))
 (forward-line 1) ; to get past the match for the start of this diff
 	(message "No following differences.")
 	(setq diff-current-difference diff-total-differences))
 (goto-char (point-min)))))
 (defun diff-previous-difference (n)
-"In diff mode, go the the beginning of the previous difference as delimited
+"Go the the beginning of the previous difference.
-by `diff-search-pattern'."
+Differences are delimited by `diff-search-pattern'."
 (interactive "p")
 (if (< n 0) (diff-next-difference (- n))
 (if (zerop n) ()
 (goto-char (point-min))
 (widen)
 				  (re-search-forward diff-search-pattern nil)
 				  (goto-char (match-beginning 0))))
 (goto-char (point-min)))))
 (defun diff-show-difference (n)
-"Show difference number N (prefix arg)."
+"Show difference number N (prefix argument)."
 (interactive "p")
 (let ((cur (string-to-int diff-current-difference)))
 (cond ((or (= n cur)
 	       (zerop n)
 	       (not (natnump n))) ; should signal an error perhaps.

Mercurial > emacs

comparison lisp/diff.el @ 474:c3bbd755b7da