X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=5072a5d15095eaea05efbb07b94fa385174e8d27;hb=3547012b6fa52dc919b22bc5c3e5f6249e5611b8;hp=66eb7d173948d96ca579f25a1a0566f88ceb7454;hpb=b436d4ee9bea6bf408b58df9223e27bf3aedf2f6;p=elisp%2Fgnus.git-

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 66eb7d1..5072a5d 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,6 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Katsumi Yamaoka <yamaoka@jpl.org>
@@ -28,41 +29,87 @@
 ;;; Code:
 
 ;; Set coding priority of Shift-JIS to the bottom.
-(defvar *predefined-category*)
-(defvar coding-category-list)
 (if (featurep 'xemacs)
-    (fset 'set-coding-priority 'ignore)
-  (fset 'coding-priority-list 'ignore)
-  (fset 'set-coding-priority-list 'ignore))
+    (defalias 'set-coding-priority 'ignore)
+  (defalias 'coding-priority-list 'ignore)
+  (defalias 'set-coding-priority-list 'ignore))
 (cond ((and (featurep 'xemacs) (featurep 'mule))
        (if (memq 'shift-jis (coding-priority-list))
 	   (set-coding-priority-list
-	    (nconc (delq 'shift-jis (coding-priority-list)) '(shift-jis)))))
+	    (append (delq 'shift-jis (coding-priority-list)) '(shift-jis)))))
       ((boundp 'MULE)
        (put '*coding-category-sjis* 'priority (length *predefined-category*)))
       ((featurep 'mule)
        (if (memq 'coding-category-sjis coding-category-list)
 	   (set-coding-priority
-	    (nconc (delq 'coding-category-sjis coding-category-list)
-		   '(coding-category-sjis))))))
+	    (append (delq 'coding-category-sjis
+			  (copy-sequence coding-category-list))
+		    '(coding-category-sjis))))))
 
-(fset 'facep 'ignore)
+(defalias 'facep 'ignore)
 
 (require 'cl)
-(require 'bytecomp)
 
-;; Attempt to pickup the additional load-path(s).
-(load (expand-file-name "./dgnuspath.el") nil nil t)
-(condition-case err
-    (load "~/.lpath.el" t nil t)
-  (error (message "Error in \"~/.lpath.el\" file: %s" err)))
+(defvar srcdir (or (getenv "srcdir") "."))
+
+(defvar dgnushack-w3-dir (let ((w3dir (getenv "W3DIR")))
+			   (unless (zerop (length w3dir))
+			     (file-name-as-directory w3dir))))
+(when dgnushack-w3-dir
+  (push dgnushack-w3-dir load-path))
+
+;; If we are building w3 in a different directory than the source
+;; directory, we must read *.el from source directory and write *.elc
+;; into the building directory.  For that, we define this function
+;; before loading bytecomp.  Bytecomp doesn't overwrite this function.
+(defun byte-compile-dest-file (filename)
+  "Convert an Emacs Lisp source file name to a compiled file name.
+ In addition, remove directory name part from FILENAME."
+  (setq filename (byte-compiler-base-file-name filename))
+  (setq filename (file-name-sans-versions filename))
+  (setq filename (file-name-nondirectory filename))
+  (if (memq system-type '(win32 w32 mswindows windows-nt))
+      (setq filename (downcase filename)))
+  (cond ((eq system-type 'vax-vms)
+	 (concat (substring filename 0 (string-match ";" filename)) "c"))
+	((string-match emacs-lisp-file-regexp filename)
+	 (concat (substring filename 0 (match-beginning 0)) ".elc"))
+	(t (concat filename ".elc"))))
 
-(push "." load-path)
+(require 'bytecomp)
+
+(unless (fboundp 'si:byte-optimize-form-code-walker)
+  (byte-optimize-form nil);; Load `byte-opt' or `byte-optimize'.
+  (setq max-specpdl-size 3000)
+  (defalias 'si:byte-optimize-form-code-walker
+    (symbol-function 'byte-optimize-form-code-walker))
+  (defun byte-optimize-form-code-walker (form for-effect)
+    (if (and for-effect (memq (car-safe form) '(and or)))
+	;; Fix bug in and/or forms.
+	(let ((fn (car form))
+	      (backwards (reverse (cdr form))))
+	  (while (and backwards
+		      (null (setcar backwards
+				    (byte-optimize-form (car backwards) t))))
+	    (setq backwards (cdr backwards)))
+	  (if (and (cdr form) (null backwards))
+	      (byte-compile-log
+	       "  all subforms of %s called for effect; deleted" form))
+	  (if backwards
+	      (let ((head backwards))
+		(while (setq backwards (cdr backwards))
+		  (setcar backwards (byte-optimize-form (car backwards)
+							nil)))
+		(cons fn (nreverse head)))))
+      (si:byte-optimize-form-code-walker form for-effect)))
+  (byte-compile 'byte-optimize-form-code-walker))
+
+(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
 
 (condition-case nil
     (char-after)
   (wrong-number-of-arguments
-   ;; Optimize byte code for `char-after',
+   ;; Optimize byte code for `char-after'.
    (put 'char-after 'byte-optimizer 'byte-optimize-char-after)
    (defun byte-optimize-char-after (form)
      (if (null (cdr form))
@@ -72,16 +119,29 @@
 (condition-case nil
     (char-before)
   (wrong-number-of-arguments
-   ;; Optimize byte code for `char-before',
+   ;; Optimize byte code for `char-before'.
    (put 'char-before 'byte-optimizer 'byte-optimize-char-before)
    (defun byte-optimize-char-before (form)
      (if (null (cdr form))
 	 '(char-before (point))
        form))))
 
-;; `char-after' and `char-before' must be well-behaved before lpath.el
-;; is loaded.  Because it requires `poe' via `path-util'.
-(load "./lpath.el" nil t)
+(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
+
+(condition-case err
+    (load "~/.lpath.el" t nil t)
+  (error (message "Error in \"~/.lpath.el\" file: %s" err)))
+
+;; Don't load path-util until `char-after' and `char-before' have been
+;; optimized because it requires `poe' and then modify the functions.
+(or (featurep 'path-util)
+    (load "apel/path-util"))
+(add-path "apel")
+(add-path "flim")
+(add-path "semi")
+
+(push srcdir load-path)
+(load (expand-file-name "lpath.el" srcdir) nil t t)
 
 (unless (fboundp 'byte-compile-file-form-custom-declare-variable)
   ;; Bind defcustom'ed variables.
@@ -108,23 +168,15 @@
     :symbol-for-testing-whether-colon-keyword-is-available-or-not
   (void-variable
    ;; Bind keywords.
-   (mapcar (lambda (keyword) (set keyword keyword))
-	   '(:button-keymap
-	     :data :file :mime-handle :path :predicate :user))))
+   (dolist (keyword '(:button-keymap :data :file :mime-handle
+				     :key-type :value-type))
+     (set keyword keyword))))
 
 ;; Unknown variables and functions.
 (unless (boundp 'buffer-file-coding-system)
   (defvar buffer-file-coding-system (symbol-value 'file-coding-system)))
-(autoload 'font-lock-set-defaults "font-lock")
-(unless (fboundp 'coding-system-get)
-  (defalias 'coding-system-get 'ignore))
-(when (boundp 'MULE)
-  (defalias 'find-coding-system 'ignore))
-(unless (fboundp 'get-charset-property)
-  (defalias 'get-charset-property 'ignore))
 (unless (featurep 'xemacs)
   (defalias 'Custom-make-dependencies 'ignore)
-  (defalias 'toolbar-gnus 'ignore)
   (defalias 'update-autoloads-from-directory 'ignore))
 (autoload 'texinfo-parse-line-arg "texinfmt")
 
@@ -139,12 +191,49 @@
 (defalias 'ange-ftp-re-read-dir 'ignore)
 (defalias 'define-mail-user-agent 'ignore)
 
-(eval-and-compile
-  (unless (string-match "XEmacs" emacs-version)
-    (fset 'get-popup-menu-response 'ignore)
-    (fset 'event-object 'ignore)
-    (fset 'x-defined-colors 'ignore)
-    (fset 'read-color 'ignore)))
+(defconst dgnushack-unexporting-files
+  (append '("dgnushack.el" "dgnuspath.el" "lpath.el" "ptexinfmt.el")
+	  (unless (or (condition-case nil
+			  (require 'w3-forms)
+			(error nil))
+		      ;; Maybe mis-configured Makefile is used (e.g.
+		      ;; configured for FSFmacs but XEmacs is running).
+		      (let ((lp (delete dgnushack-w3-dir
+					(copy-sequence load-path))))
+			(when (condition-case nil
+				  (let ((load-path lp))
+				    (require 'w3-forms))
+				(error nil))
+			  ;; If success, fix `load-path' for compiling.
+			  (setq load-path lp))))
+	    '("nnweb.el" "nnlistserv.el" "nnultimate.el"
+	      "nnslashdot.el" "nnwarchive.el" "webmail.el"
+	      "nnwfm.el"))
+	  (condition-case nil
+	      (progn (require 'bbdb) nil)
+	    (error '("gnus-bbdb.el")))
+	  (unless (featurep 'xemacs)
+	    '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
+	      "nnheaderxm.el" "smiley.el"))
+	  (when (or (featurep 'xemacs) (<= emacs-major-version 20))
+	    '("smiley-ems.el"))
+	  (when (and (fboundp 'base64-decode-string)
+		     (subrp (symbol-function 'base64-decode-string)))
+	    '("base64.el"))
+	  (when (and (fboundp 'md5) (subrp (symbol-function 'md5)))
+	    '("md5.el")))
+  "Files which will not be installed.")
+
+(defconst dgnushack-exporting-files
+  (let ((files (directory-files srcdir nil "^[^=].*\\.el$" t)))
+    (dolist (file dgnushack-unexporting-files)
+      (setq files (delete file files)))
+    (sort files 'string-lessp))
+  "Files which will be compiled and installed.")
+
+(defun dgnushack-exporting-files ()
+  "Print name of files which will be installed."
+  (princ (mapconcat 'identity dgnushack-exporting-files " ")))
 
 (defun dgnushack-compile (&optional warn)
   ;;(setq byte-compile-dynamic t)
@@ -159,182 +248,43 @@ You also then need to add the following to the lisp/dgnushack.el file:
      (push \"~/lisp/custom\" load-path)
 
 Modify to suit your needs."))
-  (let ((files (delete "dgnuspath.el"
-		       (directory-files "." nil "^[^=].*\\.el$")))
-	(xemacs (string-match "XEmacs" emacs-version))
-	;;(byte-compile-generate-call-tree t)
+
+  ;; Show `load-path'.
+  (message "load-path=(\"%s\")"
+	   (mapconcat 'identity load-path "\"\n           \""))
+
+  (dolist (file dgnushack-exporting-files)
+    (setq file (expand-file-name file srcdir))
+    (when (and (file-exists-p (setq elc (concat file "c")))
+	       (file-newer-than-file-p file elc))
+      (delete-file elc)))
+
+  (let (;;(byte-compile-generate-call-tree t)
+	(files dgnushack-exporting-files)
 	file elc)
-    (condition-case ()
-	(require 'w3-forms)
-      (error (setq files (delete "nnweb.el" (delete "nnlistserv.el" files)))))
-    (condition-case ()
-	(require 'bbdb)
-      (error (setq files (delete "gnus-bbdb.el" files))))
     (while (setq file (pop files))
-      (when (or (and (not xemacs)
-		     (not (member file '("gnus-xmas.el" "gnus-picon.el"
-					 "messagexmas.el" "nnheaderxm.el"
-					 "smiley.el" "x-overlay.el"))))
-		(and xemacs
-		     (not (member file '("md5.el")))))
-	(when (or (not (file-exists-p (setq elc (concat file "c"))))
-		  (file-newer-than-file-p file elc))
-	  (ignore-errors
-	    (byte-compile-file file)))))))
+      (setq file (expand-file-name file srcdir))
+      (when (or (not (file-exists-p (setq elc (concat file "c"))))
+		(file-newer-than-file-p file elc))
+	(ignore-errors
+	  (byte-compile-file file))))))
 
 (defun dgnushack-recompile ()
   (require 'gnus)
   (byte-recompile-directory "." 0))
 
 
-;; Avoid byte-compile warnings.
-(defvar gnus-product-name)
-(defvar early-package-load-path)
-(defvar early-packages)
-(defvar last-package-load-path)
-(defvar last-packages)
-(defvar late-package-load-path)
-(defvar late-packages)
-
-(defconst dgnushack-info-file-regexp
-  (concat "^\\(gnus\\|message\\|emacs-mime\\|gnus-ja\\|message-ja\\)"
-	  "\\.info\\(-[0-9]+\\)?$"))
-
-(defconst dgnushack-texi-file-regexp
-  "^\\(gnus\\|message\\|emacs-mime\\|gnus-ja\\|message-ja\\)\\.texi$")
-
-(defun dgnushack-make-package ()
-  (require 'gnus)
-  (let* ((product-name (downcase gnus-product-name))
-	 (lisp-dir (concat "lisp/" product-name "/"))
-	 make-backup-files)
-
-    (message "Updating autoloads for directory %s..." default-directory)
-    (let ((generated-autoload-file "auto-autoloads.el")
-	  noninteractive
-	  (omsg (symbol-function 'message)))
-      (defun message (fmt &rest args)
-	(cond ((and (string-equal "Generating autoloads for %s..." fmt)
-		    (file-exists-p (file-name-nondirectory (car args))))
-	       (funcall omsg fmt (file-name-nondirectory (car args))))
-	      ((string-equal "No autoloads found in %s" fmt))
-	      ((string-equal "Generating autoloads for %s...done" fmt))
-	      (t (apply omsg fmt args))))
-      (unwind-protect
-	  (update-autoloads-from-directory default-directory)
-	(fset 'message omsg)))
-    (byte-compile-file "auto-autoloads.el")
-
-    (with-temp-buffer
-      (let ((standard-output (current-buffer)))
-	(Custom-make-dependencies "."))
-      (message (buffer-string)))
-    (require 'cus-load)
-    (byte-compile-file "custom-load.el")
-
-    (message "Generating MANIFEST.%s for the package..." product-name)
-    (with-temp-buffer
-      (insert "pkginfo/MANIFEST." product-name "\n"
-	      lisp-dir
-	      (mapconcat
-	       'identity
-	       (sort (delete "dgnuspath.el"
-			     (delete "patchs.elc"
-				     (directory-files "." nil "\\.elc?$")))
-		     'string-lessp)
-	       (concat "\n" lisp-dir))
-	      "\ninfo/"
-	      (mapconcat
-	       'identity
-	       (sort (directory-files "../texi/"
-				      nil dgnushack-info-file-regexp)
-		     'string-lessp)
-	       "\ninfo/")
-	      "\n")
-      (write-file (concat "../MANIFEST." product-name)))))
-
-(defun dgnushack-install-package ()
-  (let ((package-dir (car command-line-args-left))
-	dirs info-dir pkginfo-dir product-name lisp-dir manifest files)
-    (unless package-dir
-      (when (boundp 'early-packages)
-	(setq dirs (delq nil (append (when early-package-load-path
-				       early-packages)
-				     (when late-package-load-path
-				       late-packages)
-				     (when last-package-load-path
-				       last-packages))))
-	(while (and dirs (not package-dir))
-	  (when (file-exists-p (car dirs))
-	    (setq package-dir (car dirs)
-		  dirs (cdr dirs))))))
-    (unless package-dir
-      (error "%s" "
-You must specify the name of the package path as follows:
-
-% make install-package PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages
-"
-	     ))
-    (setq info-dir (expand-file-name "info/" package-dir)
-	  pkginfo-dir (expand-file-name "pkginfo/" package-dir))
-    (require 'gnus)
-    (setq product-name (downcase gnus-product-name)
-	  lisp-dir (expand-file-name (concat "lisp/" product-name "/")
-				     package-dir)
-	  manifest (concat "MANIFEST." product-name))
-
-    (unless (file-directory-p lisp-dir)
-      (make-directory lisp-dir t))
-    (unless (file-directory-p info-dir)
-      (make-directory info-dir))
-    (unless (file-directory-p pkginfo-dir)
-      (make-directory pkginfo-dir))
-
-    (setq files
-	  (sort (delete "dgnuspath.el"
-			(delete "dgnuspath.elc"
-				(directory-files "." nil "\\.elc?$")))
-		'string-lessp))
-    (mapcar
-     (lambda (file)
-       (unless (member file files)
-	 (setq file (expand-file-name file lisp-dir))
-	 (message "Removing %s..." file)
-	 (condition-case nil
-	     (delete-file file)
-	   (error nil))))
-     (directory-files lisp-dir nil nil nil t))
-    (mapcar
-     (lambda (file)
-       (message "Copying %s to %s..." file lisp-dir)
-       (copy-file file (expand-file-name file lisp-dir) t t))
-     files)
-
-    (mapcar
-     (lambda (file)
-       (message "Copying ../texi/%s to %s..." file info-dir)
-       (copy-file (expand-file-name file "../texi/")
-		  (expand-file-name file info-dir)
-		  t t))
-     (sort (directory-files "../texi/" nil dgnushack-info-file-regexp)
-	   'string-lessp))
-
-    (message "Copying ../%s to %s..." manifest pkginfo-dir)
-    (copy-file (expand-file-name manifest "../")
-	       (expand-file-name manifest pkginfo-dir) t t)
-
-    (message "Done")))
-
 (defun dgnushack-texi-add-suffix-and-format ()
   (dgnushack-texi-format t))
 
 (defun dgnushack-texi-format (&optional addsuffix)
   (if (not noninteractive)
       (error "batch-texinfo-format may only be used -batch."))
-  (require 'texinfmt)
+  (require 'ptexinfmt)
   (let ((auto-save-default nil)
 	(find-file-run-dired nil)
-	coding-system-for-write)
+	coding-system-for-write
+	output-coding-system)
     (let ((error 0)
 	  file
 	  (files ()))
@@ -346,25 +296,36 @@ You must specify the name of the package path as follows:
 		     command-line-args-left (cdr command-line-args-left)))
 	      ((file-directory-p file)
 	       (setq command-line-args-left
-		     (nconc (directory-files file)
+		     (nconc (directory-files file nil nil t)
 			    (cdr command-line-args-left))))
 	      (t
 	       (setq files (cons file files)
 		     command-line-args-left (cdr command-line-args-left)))))
-      (while files
-	(setq file (car files)
-	      files (cdr files))
+      (while (setq file (pop files))
 	(condition-case err
 	    (progn
 	      (if buffer-file-name (kill-buffer (current-buffer)))
 	      (find-file file)
-	      (setq coding-system-for-write buffer-file-coding-system)
+	      (buffer-disable-undo (current-buffer))
+	      (if (boundp 'MULE)
+		  (setq output-coding-system (symbol-value
+					      'file-coding-system))
+		(setq coding-system-for-write buffer-file-coding-system))
+	      ;; Remove ignored areas first.
+	      (while (re-search-forward "^@ignore[\t\r ]*$" nil t)
+		(delete-region (match-beginning 0)
+			       (if (re-search-forward
+				    "^@end[\t ]+ignore[\t\r ]*$" nil t)
+				   (1+ (match-end 0))
+				 (point-max))))
+	      (goto-char (point-min))
+	      ;; Add suffix if it is needed.
 	      (when (and addsuffix
 			 (re-search-forward
 			  "^@setfilename[\t ]+\\([^\t\n ]+\\)" nil t)
 			 (not (string-match "\\.info$" (match-string 1))))
-		(insert ".info"))
-	      (buffer-disable-undo (current-buffer))
+		(insert ".info")
+		(goto-char (point-min)))
 	      ;; process @include before updating node
 	      ;; This might produce some problem if we use @lowersection or
 	      ;; such.
@@ -422,4 +383,109 @@ You must specify the name of the package path as follows:
 	   (setq error 1))))
       (kill-emacs error))))
 
+
+(defconst dgnushack-info-file-regexp-en
+  (let ((names '("gnus" "message" "emacs-mime"))
+	regexp name)
+    (while (setq name (pop names))
+      (setq regexp (concat regexp "^" name "\\.info\\(-[0-9]+\\)?$"
+			   (when names "\\|"))))
+    regexp)
+  "Regexp matching English info files.")
+
+(defconst dgnushack-info-file-regexp-ja
+  (let ((names '("gnus-ja" "message-ja"))
+	regexp name)
+    (while (setq name (pop names))
+      (setq regexp (concat regexp "^" name "\\.info\\(-[0-9]+\\)?$"
+			   (when names "\\|"))))
+    regexp)
+  "Regexp matching Japanese info files.")
+
+(defun dgnushack-make-autoloads ()
+  "Make auto-autoloads.el, custom-load.el and then compile them."
+  (let (make-backup-files)
+    (message "Updating autoloads for directory %s..." default-directory)
+    (let ((generated-autoload-file "auto-autoloads.el")
+	  (si:message (symbol-function 'message))
+	  noninteractive)
+      (defun message (fmt &rest args)
+	(cond ((and (string-equal "Generating autoloads for %s..." fmt)
+		    (file-exists-p (file-name-nondirectory (car args))))
+	       (funcall si:message fmt (file-name-nondirectory (car args))))
+	      ((string-equal "No autoloads found in %s" fmt))
+	      ((string-equal "Generating autoloads for %s...done" fmt))
+	      (t (apply si:message fmt args))))
+      (unwind-protect
+	  (update-autoloads-from-directory default-directory)
+	(fset 'message si:message)))
+    (byte-compile-file "auto-autoloads.el")
+    (with-temp-buffer
+      (let ((standard-output (current-buffer)))
+	(Custom-make-dependencies "."))
+      (message "%s" (buffer-string)))
+    (require 'cus-load)
+    (byte-compile-file "custom-load.el")))
+
+(defun dgnushack-remove-extra-files-in-package ()
+  "Remove extra files in the lisp directory of the XEmacs package."
+  (let ((lisp-dir (expand-file-name (concat "lisp/"
+					    ;; GNUS_PRODUCT_NAME
+					    (cadr command-line-args-left)
+					    "/")
+				    ;; PACKAGEDIR
+				    (car command-line-args-left))))
+    (when (file-directory-p lisp-dir)
+      (let (files)
+	(dolist (file dgnushack-exporting-files)
+	  (setq files (nconc files (list file (concat file "c")))))
+	(dolist (file (directory-files lisp-dir nil nil t t))
+	  (unless (member file files)
+	    (setq file (expand-file-name file lisp-dir))
+	    (message "Removing %s..." file)
+	    (condition-case nil
+		(delete-file file)
+	      (error nil))))))))
+
+(defun dgnushack-install-package-manifest ()
+  "Install MANIFEST file as an XEmacs package."
+  (let* ((package-dir (car command-line-args-left))
+	 (product-name (cadr command-line-args-left))
+	 (name (expand-file-name (concat "pkginfo/MANIFEST." product-name)
+				 package-dir))
+	 make-backup-files)
+    (message "Generating %s..." name)
+    (with-temp-file name
+      (insert "pkginfo/MANIFEST." product-name "\n")
+      (let ((lisp-dir (concat "lisp/" product-name "/"))
+	    (files (sort (directory-files "." nil "\\.elc?$" t) 'string-lessp))
+	    file)
+	(while (setq file (pop files))
+	  (unless (member file dgnushack-unexporting-files)
+	    (insert lisp-dir file "\n")))
+	(setq files
+	      (sort (directory-files "../texi/" nil
+				     (concat dgnushack-info-file-regexp-en
+					     "\\|"
+					     dgnushack-info-file-regexp-ja)
+				     t)
+		    'string-lessp))
+	(while (setq file (pop files))
+	  (insert "info/" file "\n"))))))
+
+
+(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