mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(viper-frame-value): Prefer buffer-local value, if set, over frame value.

Browse source
This commit is contained in:
Glenn Morris 2008-03-03 03:24:32 +00:00
parent 4cba674aba
commit aba08fe5f6
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2008-03-03 Glenn Morris <rgm@gnu.org>
* emulation/viper-util.el (viper-frame-value): Prefer buffer-local
value, if set, over frame value.
* simple.el (transient-mark-mode): Don't turn on by default.
* net/tls.el (open-tls-stream): Restore the 2007-11-04 change

13
lisp/emulation/viper-util.el
View file

@ -130,11 +130,14 @@ Otherwise return the normal value."
,variable
;; Frame-local variables are obsolete from Emacs 22.2 onwards,
;; so we do it by hand instead.
;; 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))))
;; 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)))))
;; OS/2
(cond ((eq (viper-device-type) 'pm)