Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324

7 files changed, 32 insertions, 14 deletions

diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index b5fd7ee602c..7c254da869a 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -148,7 +148,7 @@ does not load the scroll-all package."
 
 (defun crisp-region-active ()
   "Compatibility function to test for an active region."
-  (if (boundp 'zmacs-region-active-p)
+  (if (featurep 'xemacs)
       zmacs-region-active-p
     mark-active))
 
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 686a79c9350..e9de0409aa4 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -751,9 +751,7 @@ version of Emacs."
 Sets the mark at POS and activates the region according to the
 current version of Emacs."
   (set-mark pos)
-  ;; We use a separate `if' for the fboundp so the byte-compiler notices it
-  ;; and doesn't complain about the subsequent call.
-  (if (fboundp 'zmacs-activate-region) (if pos (zmacs-activate-region))))
+  (when (featurep 'xemacs) (when pos (zmacs-activate-region))))
 
 (defun tpu-string-prompt (prompt history-symbol)
   "Read a string with PROMPT."
@@ -2439,7 +2437,7 @@ If FILE is nil, try to load a default file.  The default file names are
 
 
 ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins
-;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "e0629234f1abe076917a303456b48329")
+;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "c7ce8bad68736a5682eb3f5f5edc48db")
 ;;; Generated autoloads from tpu-extras.el
 
 (autoload 'tpu-cursor-free-mode "tpu-extras" "\
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 3d74286589c..68116cde092 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -47,6 +47,9 @@
 (defvar initial)
 (defvar undo-beg-posn)
 (defvar undo-end-posn)
+
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 ;; end pacifier
 
 
@@ -2773,7 +2776,9 @@ On reaching beginning of line, stop and signal error."
 (defun viper-next-line-carefully (arg)
   (condition-case nil
       ;; do not use forward-line! need to keep column
-      (with-no-warnings (next-line arg))
+      (if (featurep 'emacs)
+          (with-no-warnings (next-line arg))
+        (next-line arg))
     (error nil)))
 
 
@@ -3073,7 +3078,9 @@ On reaching beginning of line, stop and signal error."
         (com (viper-getCom arg)))
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
-    (with-no-warnings (next-line val))
+    (if (featurep 'emacs)
+        (with-no-warnings (next-line val))
+      (next-line val))
     (if viper-ex-style-motion
         (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'next-line)
@@ -3120,7 +3127,9 @@ If point is on a widget or a button, simulate clicking on that widget/button."
         (com (viper-getCom arg)))
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
-    (with-no-warnings (previous-line val))
+    (if (featurep 'emacs)
+        (with-no-warnings (previous-line val))
+      (previous-line val))
     (if viper-ex-style-motion
         (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'previous-line)
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 6ce34852235..8e19a0b50bd 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -2216,9 +2216,11 @@ Type 'mak ' (including the space) to run make with no args."
         (pos2 (viper-line-pos 'end))
         lines file info)
     (setq lines (count-lines (point-min) (viper-line-pos 'end))
-          file (if (buffer-file-name)
-                   (concat (viper-abbreviate-file-name (buffer-file-name)) ":")
-                 (concat (buffer-name) " [Not visiting any file]:"))
+          file (cond ((buffer-file-name)
+                      (concat (viper-abbreviate-file-name (buffer-file-name)) ":"))
+                     ((buffer-file-name (buffer-base-buffer))
+                      (concat (viper-abbreviate-file-name (buffer-file-name (buffer-base-buffer))) " (indirect buffer):"))
+                     (t (concat (buffer-name) " [Not visiting any file]:")))
           info (format "line=%d/%d pos=%d/%d col=%d %s"
                        (if (= pos1 pos2)
                            (1+ lines)
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index f76a9310518..05c90f995ab 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -33,6 +33,9 @@
 (defvar viper-expert-level)
 (defvar viper-ex-style-editing)
 (defvar viper-ex-style-motion)
+
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 ;; end pacifier
 
 (require 'viper-util)
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 33061565196..b838d8ce80e 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -44,6 +44,9 @@
 
 (require 'ring)
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
+
 ;; end pacifier
 
 (require 'viper-init)
@@ -713,7 +716,7 @@
              (not (memq (vc-state file) '(edited needs-merge)))
              (not (stringp (vc-state file))))
          ;; XEmacs has no vc-state
-         (if (featurep 'xemacs)(not (vc-locking-user file))))
+         (if (featurep 'xemacs) (not (vc-locking-user file))))
        ))
 
 ;; checkout if visited file is checked in
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 19d3a7f018a..9d2acac4ce7 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
 
-(defconst viper-version "3.14 of August 18, 2007"
+(defconst viper-version "3.14 of January 09, 2008"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
@@ -857,7 +857,9 @@ It also can't undo some Viper settings."
                (modify-frame-parameters
                 (selected-frame)
                 (list (cons 'viper-vi-state-cursor-color
-                            (viper-get-cursor-color))))))
+                            (viper-get-cursor-color))))
+               (setq viper-vi-state-cursor-color (viper-get-cursor-color))
+               ))
 
   ;; Tell vc-diff to put *vc* in Vi mode
   (if (featurep 'vc)
@@ -900,6 +902,7 @@ It also can't undo some Viper settings."
     (modify-frame-parameters
         (selected-frame)
         (list (cons 'viper-vi-state-cursor-color (ad-get-arg 0))))
+    (setq viper-vi-state-cursor-color (ad-get-arg 0))
     )
 
   (when (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))