Synch to No Gnus 200406292138.

[elisp/gnus.git-] / lisp / dgnushack.el

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 0b09ff6..bd04d08 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -56,6 +56,7 @@
   (load "cl-macs" nil t))
 
 (defvar srcdir (or (getenv "srcdir") "."))
+(defvar loaddir (and load-file-name (file-name-directory load-file-name)))
 
 (defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR")))
                                 (unless (zerop (length w3dir))
@@ -267,7 +268,8 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
         (set-syntax-table stab)))))
 
 (push srcdir load-path)
-(load (expand-file-name "lpath.el" srcdir) nil t t)
+(push loaddir load-path)
+(load (expand-file-name "lpath.el" loaddir) nil t)
 
 (require 'custom)
 
@@ -305,8 +307,10 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
     (autoload 'apropos-command "apropos" nil t)
     (autoload 'bbdb-complete-name "bbdb-com" nil t)
     (autoload 'browse-url "browse-url" nil t)
+    (autoload 'c-mode "cc-mode" nil t)
     (autoload 'customize-apropos "cus-edit" nil t)
     (autoload 'customize-save-variable "cus-edit" nil t)
+    (autoload 'customize-set-variable "cus-edit" nil t)
     (autoload 'customize-variable "cus-edit" nil t)
     (autoload 'delete-annotation "annotations")
     (autoload 'dolist "cl-macs" nil nil 'macro)
@@ -314,6 +318,7 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
     (autoload 'executable-find "executable")
     (autoload 'font-lock-fontify-buffer "font-lock" nil t)
     (autoload 'info "info" nil t)
+    (autoload 'mail-fetch-field "mail-utils")
     (autoload 'make-annotation "annotations")
     (autoload 'make-display-table "disp-table")
     (autoload 'pp "pp")
@@ -326,6 +331,7 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
     (if (emacs-version>= 21 5)
        (autoload 'setenv "process" nil t)
       (autoload 'setenv "env" nil t))
+    (autoload 'sgml-mode "psgml" nil t)
     (autoload 'smtpmail-send-it "smtpmail")
     (autoload 'sort-numeric-fields "sort" nil t)
     (autoload 'sort-subr "sort")
@@ -361,7 +367,8 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
   (autoload 'std11-unfold-region "nnheader"))
 
 (defconst dgnushack-unexporting-files
-  (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el")
+  (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el"
+           "legacy-gnus-agent.el")
          (unless (or (condition-case code
                          (require 'w3-parse)
                        (error
@@ -686,19 +693,4 @@ dgnushack-compile."
        (while (setq file (pop files))
          (insert "info/" file "\n"))))))
 
-\f
-(define-compiler-macro describe-key-briefly (&whole form key &optional insert)
-  (if (condition-case nil
-         (progn
-           (describe-key-briefly '((())) nil)
-           t)
-       (wrong-number-of-arguments nil);; Old Emacsen.
-       (error t))
-      form
-    (if insert
-       `(if ,insert
-            (insert (funcall 'describe-key-briefly ,key))
-          (funcall 'describe-key-briefly ,key))
-      `(funcall 'describe-key-briefly ,key))))
-
 ;;; dgnushack.el ends here