[Emacs-diffs] Changes to emacs/lisp/emulation/viper-util.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/03 03:24:20

Index: viper-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-util.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- viper-util.el       1 Mar 2008 20:19:23 -0000       1.76
+++ viper-util.el       3 Mar 2008 03:24:20 -0000       1.77
@@ -130,11 +130,14 @@
        ,variable
      ;; Frame-local variables are obsolete from Emacs 22.2 onwards,
      ;; so we do it by hand instead.
+     ;; Buffer-local values take precedence over frame-local ones.
+     (if (local-variable-p ',variable)
+        ,variable
      ;; Distinguish between no frame parameter and a frame parameter
      ;; with a value of nil.
      (let ((fp (assoc ',variable (frame-parameters))))
        (if fp (cdr fp)
-        ,variable))))
+          ,variable)))))
 
 ;; OS/2
 (cond ((eq (viper-device-type) 'pm)