* viper-cmd.el (viper--key-maps): new variable.

	(viper-normalize-minor-mode-map-alist): use viper--key-maps and
	emulation-mode-map-alists.
	(viper-envelop-ESC-key): use viper-subseq.
	(viper-search-forward/backward/next): disable debug-on-error.

	* viper-keym.el (viper-toggle-key,viper-quoted-insert-key,
	viper-ESC-key): new defcustoms.

	* viper-macs.el (ex-map-read-args): use viper-subseq.

	* viper-util.el (viper-key-to-emacs-key): use viper-subseq.
	(viper-subseq): copy of subseq from cl.el.

	* viper.el (viper-go-away,viper-set-hooks): use
	emulation-mode-map-alists, advise self-insert-command, add-minor-mode.

	* viper-mous.el (viper-current-frame-saved): use defvar.

	* viper-init.el: got rid of -face in face names.

	* ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3):
	Make it work with longlines mode

	* ediff-mult.el (ediff-meta-mode-hook): new variable.

	* ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp.

	* ediff-init: got rid of -face in face names.

1 files changed, 86 insertions, 36 deletions

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 659c4ffedb0..6d6b36692bc 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -459,24 +459,46 @@ one optional arguments, diff-number to refine.")
                    c-prev c-end)
            ;; else convert lines to points
            (ediff-with-current-buffer A-buffer
-             (forward-line (- a-begin a-prev))
-             (setq a-begin-pt (point))
-             (forward-line (- a-end a-begin))
-             (setq a-end-pt (point)
-                   a-prev a-end))
+             (let ((longlines-mode-val
+                    (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
+               ;; we must disable and then restore longlines-mode
+               (if (eq longlines-mode-val 1)
+                   (longlines-mode 0))
+               (forward-line (- a-begin a-prev))
+               (setq a-begin-pt (point))
+               (forward-line (- a-end a-begin))
+               (setq a-end-pt (point)
+                     a-prev a-end)
+               (if (eq longlines-mode-val 1)
+                   (longlines-mode longlines-mode-val))
+               ))
            (ediff-with-current-buffer B-buffer
-             (forward-line (- b-begin b-prev))
-             (setq b-begin-pt (point))
-             (forward-line (- b-end b-begin))
-             (setq b-end-pt (point)
-                   b-prev b-end))
+             (let ((longlines-mode-val
+                    (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
+               (if (eq longlines-mode-val 1)
+                   (longlines-mode 0))
+               (forward-line (- b-begin b-prev))
+               (setq b-begin-pt (point))
+               (forward-line (- b-end b-begin))
+               (setq b-end-pt (point)
+                     b-prev b-end)
+               (if (eq longlines-mode-val 1)
+                   (longlines-mode longlines-mode-val))
+               ))
            (if (ediff-buffer-live-p C-buffer)
                (ediff-with-current-buffer C-buffer
-                 (forward-line (- c-begin c-prev))
-                 (setq c-begin-pt (point))
-                 (forward-line (- c-end c-begin))
-                 (setq c-end-pt (point)
-                       c-prev c-end)))
+                 (let ((longlines-mode-val
+                        (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
+                   (if (eq longlines-mode-val 1)
+                       (longlines-mode 0))
+                   (forward-line (- c-begin c-prev))
+                   (setq c-begin-pt (point))
+                   (forward-line (- c-end c-begin))
+                   (setq c-end-pt (point)
+                         c-prev c-end)
+                   (if (eq longlines-mode-val 1)
+                       (longlines-mode longlines-mode-val))
+                 )))
            (setq diff-list
                  (nconc
                   diff-list
@@ -1060,30 +1082,59 @@ delimiter regions"))
                          c-prev c-end)
                  ;; else convert lines to points
                  (ediff-with-current-buffer A-buffer
-                   (forward-line (- a-begin a-prev))
-                   (setq a-begin-pt (point))
-                   (forward-line (- a-end a-begin))
-                   (setq a-end-pt (point)
-                         a-prev a-end))
+                   (let ((longlines-mode-val
+                          (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
+                     ;; we must disable and then restore longlines-mode
+                     (if (eq longlines-mode-val 1)
+                         (longlines-mode 0))
+                     (forward-line (- a-begin a-prev))
+                     (setq a-begin-pt (point))
+                     (forward-line (- a-end a-begin))
+                     (setq a-end-pt (point)
+                           a-prev a-end)
+                     (if (eq longlines-mode-val 1)
+                         (longlines-mode longlines-mode-val))
+                     ))
                  (ediff-with-current-buffer B-buffer
-                   (forward-line (- b-begin b-prev))
-                   (setq b-begin-pt (point))
-                   (forward-line (- b-end b-begin))
-                   (setq b-end-pt (point)
-                         b-prev b-end))
+                   (let ((longlines-mode-val
+                          (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
+                     (if (eq longlines-mode-val 1)
+                         (longlines-mode 0))
+                     (forward-line (- b-begin b-prev))
+                     (setq b-begin-pt (point))
+                     (forward-line (- b-end b-begin))
+                     (setq b-end-pt (point)
+                           b-prev b-end)
+                     (if (eq longlines-mode-val 1)
+                         (longlines-mode longlines-mode-val))
+                     ))
                  (ediff-with-current-buffer C-buffer
-                   (forward-line (- c-begin c-prev))
-                   (setq c-begin-pt (point))
-                   (forward-line (- c-end c-begin))
-                   (setq c-end-pt (point)
-                         c-prev c-end))
+                   (let ((longlines-mode-val
+                          (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
+                     (if (eq longlines-mode-val 1)
+                         (longlines-mode 0))
+                     (forward-line (- c-begin c-prev))
+                     (setq c-begin-pt (point))
+                     (forward-line (- c-end c-begin))
+                     (setq c-end-pt (point)
+                           c-prev c-end)
+                     (if (eq longlines-mode-val 1)
+                         (longlines-mode longlines-mode-val))
+                     ))
                  (if (ediff-buffer-live-p anc-buffer)
                      (ediff-with-current-buffer anc-buffer
-                       (forward-line (- c-or-anc-begin anc-prev))
-                       (setq anc-begin-pt (point))
-                       (forward-line (- c-or-anc-end c-or-anc-begin))
-                       (setq anc-end-pt (point)
-                             anc-prev c-or-anc-end)))
+                       (let ((longlines-mode-val
+                              (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
+                         (if (eq longlines-mode-val 1)
+                             (longlines-mode 0))
+                         (forward-line (- c-or-anc-begin anc-prev))
+                         (setq anc-begin-pt (point))
+                         (forward-line (- c-or-anc-end c-or-anc-begin))
+                         (setq anc-end-pt (point)
+                               anc-prev c-or-anc-end)
+                         (if (eq longlines-mode-val 1)
+                             (longlines-mode longlines-mode-val))
+                         )))
                  (setq diff-list
                        (nconc
                         diff-list
@@ -1425,6 +1476,5 @@ affects only files whose names match the expression."
 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;;; End:
 
-
 ;;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648
 ;;; ediff-diff.el ends here