[Emacs-diffs] /srv/bzr/emacs/trunk r110246: Do not autoload defcustoms in hippie-exp.el

[Glenn Morris]

------------------------------------------------------------
revno: 110246
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-29 11:15:57 -0700
message:
  Do not autoload defcustoms in hippie-exp.el
  
  * lisp/hippie-exp.el (hippie-expand-try-functions-list)
  (hippie-expand-verbose, hippie-expand-dabbrev-skip-space)
  (hippie-expand-dabbrev-as-symbol, hippie-expand-no-restriction)
  (hippie-expand-max-buffers, hippie-expand-ignore-buffers)
  (hippie-expand-only-buffers): Do not autoload defcustoms.
  * lisp/progmodes/vhdl-mode.el (vhdl-line-expand):
  Explicitly load hippie-exp, so it does not get autoloaded
  while hippie-expand-try-functions-list is let-bound.
modified:
  lisp/ChangeLog
  lisp/hippie-exp.el
  lisp/progmodes/vhdl-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-28 23:51:20 +0000
+++ b/lisp/ChangeLog    2012-09-29 18:15:57 +0000
@@ -1,3 +1,14 @@
+2012-09-29  Glenn Morris  <address@hidden>
+
+       * hippie-exp.el (hippie-expand-try-functions-list)
+       (hippie-expand-verbose, hippie-expand-dabbrev-skip-space)
+       (hippie-expand-dabbrev-as-symbol, hippie-expand-no-restriction)
+       (hippie-expand-max-buffers, hippie-expand-ignore-buffers)
+       (hippie-expand-only-buffers): Do not autoload defcustoms.
+       * progmodes/vhdl-mode.el (vhdl-line-expand):
+       Explicitly load hippie-exp, so it does not get autoloaded
+       while hippie-expand-try-functions-list is let-bound.
+
 2012-09-28  Glenn Morris  <address@hidden>
 
        * emacs-lisp/cl.el (flet): Fix case of obsolescence message.

=== modified file 'lisp/hippie-exp.el'
--- a/lisp/hippie-exp.el        2012-07-25 05:48:19 +0000
+++ b/lisp/hippie-exp.el        2012-09-29 18:15:57 +0000
@@ -199,7 +199,6 @@
 
 (defvar he-search-window ())
 
-;;;###autoload
 (defcustom hippie-expand-try-functions-list
   '(try-complete-file-name-partially
     try-complete-file-name
@@ -217,31 +216,26 @@
   :type '(repeat function)
   :group 'hippie-expand)
 
-;;;###autoload
 (defcustom hippie-expand-verbose t
   "Non-nil makes `hippie-expand' output which function it is trying."
   :type 'boolean
   :group 'hippie-expand)
 
-;;;###autoload
 (defcustom hippie-expand-dabbrev-skip-space nil
   "Non-nil means tolerate trailing spaces in the abbreviation to expand."
   :group 'hippie-expand
   :type 'boolean)
 
-;;;###autoload
 (defcustom hippie-expand-dabbrev-as-symbol t
   "Non-nil means expand as symbols, i.e. syntax `_' is considered a letter."
   :group 'hippie-expand
   :type 'boolean)
 
-;;;###autoload
 (defcustom hippie-expand-no-restriction t
   "Non-nil means that narrowed buffers are widened during search."
   :group 'hippie-expand
   :type 'boolean)
 
-;;;###autoload
 (defcustom hippie-expand-max-buffers ()
   "The maximum number of buffers (apart from the current) searched.
 If nil, all buffers are searched."
@@ -249,7 +243,6 @@
                 integer)
   :group 'hippie-expand)
 
-;;;###autoload
 (defcustom hippie-expand-ignore-buffers (list (purecopy "^ \\*.*\\*$") 
'dired-mode)
   "A list specifying which buffers not to search (if not current).
 Can contain both regexps matching buffer names (as strings) and major modes
@@ -257,7 +250,6 @@
   :type '(repeat (choice regexp (symbol :tag "Major Mode")))
   :group 'hippie-expand)
 
-;;;###autoload
 (defcustom hippie-expand-only-buffers ()
   "A list specifying the only buffers to search (in addition to current).
 Can contain both regexps matching buffer names (as strings) and major modes

=== modified file 'lisp/progmodes/vhdl-mode.el'
--- a/lisp/progmodes/vhdl-mode.el       2012-09-06 09:36:40 +0000
+++ b/lisp/progmodes/vhdl-mode.el       2012-09-29 18:15:57 +0000
@@ -12522,6 +12522,7 @@
 (defun vhdl-line-expand (&optional prefix-arg)
   "Hippie-expand current line."
   (interactive "P")
+  (require 'hippie-exp)
   (let ((case-fold-search t) (case-replace nil)
        (hippie-expand-try-functions-list
         '(try-expand-line try-expand-line-all-buffers)))