[Emacs-diffs] master e6681b2: Nix more uses of default-FOO variables (Bug#24946)

[Mark Oteiza]

branch: master
commit e6681b27394a23979c3aef3925f78ef9cd75bd32
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>

    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.
---
 lisp/cedet/semantic/util-modes.el |    2 +-
 lisp/emulation/viper.el           |    2 +-
 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 6b80c96..4f7f051 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 04a7c22..c5dac55 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 bb93cff9..eed664d 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