diff options
| author | Glenn Morris | 2008-03-03 03:24:32 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-03 03:24:32 +0000 |
| commit | aba08fe5f68c19febc0ffde6b67af5142b269a97 (patch) | |
| tree | f6196fa0d2660b5249b264ccdc20db82bd025dda /lisp/emulation | |
| parent | 4cba674aba37edbc235a4e1a88d7421d77af9084 (diff) | |
| download | emacs-aba08fe5f68c19febc0ffde6b67af5142b269a97.tar.gz emacs-aba08fe5f68c19febc0ffde6b67af5142b269a97.zip | |
(viper-frame-value): Prefer buffer-local value, if set, over frame value.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper-util.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index e96f671cc53..291c03c4c4e 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el | |||
| @@ -130,11 +130,14 @@ Otherwise return the normal value." | |||
| 130 | ,variable | 130 | ,variable |
| 131 | ;; Frame-local variables are obsolete from Emacs 22.2 onwards, | 131 | ;; Frame-local variables are obsolete from Emacs 22.2 onwards, |
| 132 | ;; so we do it by hand instead. | 132 | ;; so we do it by hand instead. |
| 133 | ;; Distinguish between no frame parameter and a frame parameter | 133 | ;; Buffer-local values take precedence over frame-local ones. |
| 134 | ;; with a value of nil. | 134 | (if (local-variable-p ',variable) |
| 135 | (let ((fp (assoc ',variable (frame-parameters)))) | 135 | ,variable |
| 136 | (if fp (cdr fp) | 136 | ;; Distinguish between no frame parameter and a frame parameter |
| 137 | ,variable)))) | 137 | ;; with a value of nil. |
| 138 | (let ((fp (assoc ',variable (frame-parameters)))) | ||
| 139 | (if fp (cdr fp) | ||
| 140 | ,variable))))) | ||
| 138 | 141 | ||
| 139 | ;; OS/2 | 142 | ;; OS/2 |
| 140 | (cond ((eq (viper-device-type) 'pm) | 143 | (cond ((eq (viper-device-type) 'pm) |