* viper*el: replaced old-style backquotes.

* ediff*el: replaced old-style backquotes.

	* ediff-merge
	(ediff-looks-like-combined-merge,ediff-get-combined-region):
	changed to support the new format for ediff-combination-pattern.

	* ediff-diff (ediff-set-fine-overlays-in-one-buffer):
	changed to support the new format for ediff-combination-pattern.

lisp/ChangeLog

@@ -1,3 +1,16 @@
+1999-11-24  Michael Kifer  <kifer@cs.sunysb.edu>
+	
+	* viper*el: replaced old-style backquotes.
+	
+	* ediff*el: replaced old-style backquotes.
+	
+	* ediff-merge
+	(ediff-looks-like-combined-merge,ediff-get-combined-region):
+	changed to support the new format for ediff-combination-pattern.
+	
+	* ediff-diff (ediff-set-fine-overlays-in-one-buffer):
+	changed to support the new format for ediff-combination-pattern.
+	
 1999-11-24  Dave Love  <fx@gnu.org>
 
 	* custom.el (custom-declare-group): Purecopy DOC.

lisp/emulation/viper-cmd.el

@@ -404,8 +404,7 @@
 (defun viper-normalize-minor-mode-map-alist ()
   (setq minor-mode-map-alist
 	(viper-append-filter-alist
-	 (list
+	 (list (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
-	       (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
 	       (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map)
 	       (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map)
 	       (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map)
@@ -457,8 +456,6 @@
 	 minor-mode-map-alist)))
 
 
-
-
 
 ;; Viper mode-changing commands and utilities
 
@@ -1660,6 +1657,7 @@ invokes the command before that, etc."
 	(viper-push-onto-ring viper-d-com 'viper-command-ring)))
   (setq viper-this-command-keys nil))
 
+
 (defun viper-prev-destructive-command (next)
   "Find previous destructive command in the history of destructive commands.
 With prefix argument, find next destructive command."
@@ -1679,11 +1677,13 @@ With prefix argument, find next destructive command."
       (setq viper-d-com cmd))
     (viper-display-current-destructive-command)))
 
+
 (defun viper-next-destructive-command ()
   "Find next destructive command in the history of destructive commands."
   (interactive)
   (viper-prev-destructive-command 'next))
 
+
 (defun viper-insert-prev-from-insertion-ring (arg)
   "Cycle through insertion ring in the direction of older insertions.
 Undoes previous insertion and inserts new.
@@ -1723,6 +1723,7 @@ Undo previous insertion and inserts new."
   (interactive)
   (viper-insert-prev-from-insertion-ring 'next))
 
+
 
 ;; some region utilities
 
@@ -1838,6 +1839,7 @@ Undo previous insertion and inserts new."
     (funcall hook)
     ))
 
+
 ;; Interpret last event in the local map first; if fails, use exit-minibuffer.
 ;; Run viper-minibuffer-exit-hook before exiting.
 (defun viper-exit-minibuffer ()
@@ -2518,6 +2520,7 @@ On reaching end of line, stop and signal error."
       (forward-char val)
       (if com (viper-execute-com 'viper-forward-char val com)))))
 
+
 (defun viper-backward-char (arg)
   "Move point left ARG characters (right if ARG negative).
 On reaching beginning of line, stop and signal error."
@@ -2533,6 +2536,7 @@ On reaching beginning of line, stop and signal error."
       (backward-char val)
       (if com (viper-execute-com 'viper-backward-char val com)))))
 
+
 ;; Like forward-char, but doesn't move at end of buffer.
 ;; Returns distance traveled
 ;; (positive or 0, if arg positive; negative if arg negative).
@@ -2546,6 +2550,7 @@ On reaching beginning of line, stop and signal error."
 	(- (viper-chars-in-region pt (point)))
       (viper-chars-in-region pt (point)))))
 
+
 ;; Like backward-char, but doesn't move at beg of buffer.
 ;; Returns distance traveled
 ;; (negative or 0, if arg positive; positive if arg negative).
@@ -2594,6 +2599,7 @@ On reaching beginning of line, stop and signal error."
 	(viper-skip-all-separators-backward 'within-line)
       (or (bobp) (forward-char)))))
 
+
 (defun viper-forward-word-kernel (val)
   (while (> val 0)
     (cond ((viper-looking-at-alpha)
@@ -2877,6 +2883,7 @@ On reaching beginning of line, stop and signal error."
     (back-to-indentation)
     (if com (viper-execute-com 'viper-next-line-at-bol val com))))
 
+
 (defun viper-previous-line (arg)
   "Go to previous line."
   (interactive "P")
@@ -3985,6 +3992,7 @@ Null string will repeat previous search."
 	(ding))
     (delete-backward-char val t)))
 
+
 (defun viper-del-backward-char-in-insert ()
   "Delete 1 char backwards while in insert mode."
   (interactive)
@@ -3992,6 +4000,7 @@ Null string will repeat previous search."
       (beep 1)
     (delete-backward-char 1 t)))
 
+
 (defun viper-del-backward-char-in-replace ()
   "Delete one character in replace mode.
 If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes
@@ -4559,6 +4568,7 @@ sensitive for VI-style look-and-feel."
 	  (and (> viper-expert-level 0) (> 5 viper-expert-level)))
       (viper-set-hooks)))
 
+
 ;; Ask user expert level.
 (defun viper-ask-level (dont-change-unless)
   (let ((ask-buffer " *viper-ask-level*")
@@ -4797,7 +4807,6 @@ Mail anyway (y or n)? ")
 
 
 
-
 ;; Smoothes out the difference between Emacs' unread-command-events
 ;; and XEmacs unread-command-event.  Arg is a character, an event, a list of
 ;; events or a sequence of keys.