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.
This commit is contained in:
Mark Oteiza 2016-11-15 13:31:31 -05:00
parent 4e2ef64449
commit e6681b2739
3 changed files with 3 additions and 3 deletions

View file

@ -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"))

View file

@ -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))

View file

@ -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