diff options
| author | Mark Oteiza <mvoteiza@udel.edu> | 2016-11-15 13:31:31 -0500 |
|---|---|---|
| committer | Mark Oteiza <mvoteiza@udel.edu> | 2016-11-15 13:35:07 -0500 |
| commit | e6681b27394a23979c3aef3925f78ef9cd75bd32 (patch) | |
| tree | a008c2641d8b61f29bc03b70830b21601c6d6426 | |
| parent | 4e2ef64449ce5dc91e2d533c0fbaaf50b0e92f3b (diff) | |
| download | emacs-e6681b27394a23979c3aef3925f78ef9cd75bd32.tar.gz | |
Nix more uses of default-FOO variables (Bug#24946)
* lisp/cedet/semantic/util-modes.el (semantic-stickyfunc-mode):
Check for header-line-format instead.
* lisp/emulation/viper.el (viper-load-custom-file): Reference
major-mode instead.
* lisp-mail-feedmail.el (feedmail-fill-to-cc-fill-column): Use
fill-column instead.
| -rw-r--r-- | lisp/cedet/semantic/util-modes.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper.el | 2 | ||||
| -rw-r--r-- | lisp/mail/feedmail.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index 6b80c96173c..4f7f0518dbf 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el @@ -712,7 +712,7 @@ minor mode is enabled." ;; Disable minor mode if semantic stuff not available (setq semantic-stickyfunc-mode nil) (error "Buffer %s was not set up for parsing" (buffer-name))) - (unless (boundp 'default-header-line-format) + (unless (boundp 'header-line-format) ;; Disable if there are no header lines to use. (setq semantic-stickyfunc-mode nil) (error "Sticky Function mode requires Emacs")) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 04a7c22e787..c5dac55522a 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -1234,7 +1234,7 @@ These two lines must come in the order given.")) (if (null viper-saved-non-viper-variables) (setq viper-saved-non-viper-variables (list - (cons 'default-major-mode (list (default-value 'major-mode))) + (cons 'major-mode (list (default-value 'major-mode))) (cons 'next-line-add-newlines (list next-line-add-newlines)) (cons 'require-final-newline (list require-final-newline)) (cons 'scroll-step (list scroll-step)) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index bb93cff96bc..eed664d088e 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -504,7 +504,7 @@ as-is. The filling is done after mail address alias expansion." ) -(defcustom feedmail-fill-to-cc-fill-column default-fill-column +(defcustom feedmail-fill-to-cc-fill-column (default-value 'fill-column) "Fill column used by `feedmail-fill-to-cc'." :group 'feedmail-headers :type 'integer |