X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=f5bf8720178fd76bce335057f1d4b7c807b6b2f0;hb=4e9ee501d9be871c60277ef358709e8050975572;hp=701158c50501813aa36b028b55341738a4cae5e9;hpb=5f3ddf974129507207ffb350e6639334313cca35;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 701158c50..f5bf87201 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -33,6 +33,7 @@
 (defalias 'facep 'ignore)
 
 (require 'cl)
+(require 'iswitchb)
 
 (defvar srcdir (or (getenv "srcdir") "."))
 (defvar loaddir (and load-file-name (file-name-directory load-file-name)))
@@ -80,69 +81,6 @@
 ;  (cons 'progn (cdr form)))
 ;(defalias 'byte-compile-file-form-defsubst 'byte-compile-file-form-defun)
 
-(when (and (not (featurep 'xemacs))
-	   (= emacs-major-version 21)
-	   (>= emacs-minor-version 3)
-	   (condition-case code
-	       (let ((byte-compile-error-on-warn t))
-		 (byte-optimize-form (quote (pop x)) t)
-		 nil)
-	     (error (string-match "called for effect"
-				  (error-message-string code)))))
-  (defadvice byte-optimize-form-code-walker (around silence-warn-for-pop
-						    (form for-effect)
-						    activate)
-    "Silence the warning \"...called for effect\" for the `pop' form.
-It is effective only when the `pop' macro is defined by cl.el rather
-than subr.el."
-    (let (tmp)
-      (if (and (eq (car-safe form) 'car)
-	       for-effect
-	       (setq tmp (get 'car 'side-effect-free))
-	       (not byte-compile-delete-errors)
-	       (not (eq tmp 'error-free))
-	       (eq (car-safe (cadr form)) 'prog1)
-	       (let ((var (cadr (cadr form)))
-		     (last (nth 2 (cadr form))))
-		 (and (symbolp var)
-		      (null (nthcdr 3 (cadr form)))
-		      (eq (car-safe last) 'setq)
-		      (eq (cadr last) var)
-		      (eq (car-safe (nth 2 last)) 'cdr)
-		      (eq (cadr (nth 2 last)) var))))
-	  (progn
-	    (put 'car 'side-effect-free 'error-free)
-	    (unwind-protect
-		ad-do-it
-	      (put 'car 'side-effect-free tmp)))
-	ad-do-it))))
-
-(when (and (not (featurep 'xemacs))
-	   (byte-optimize-form
-	    '(and (> 0 1)
-		  (message "This should not appear in the byte-code."))
-	    t))
-  (defadvice byte-optimize-form-code-walker
-    (around fix-bug-in-and/or-forms (form for-effect) activate)
-    "Optimize the rest of the and/or forms.
-It has been fixed in XEmacs before releasing 21.4 and also has been
-fixed in Emacs 22."
-    (if (and for-effect (memq (car-safe form) '(and or)))
-	(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))
-	  (when backwards
-	    (setcdr backwards
-		    (mapcar 'byte-optimize-form (cdr backwards))))
-	  (setq ad-return-value (cons fn (nreverse backwards))))
-      ad-do-it)))
-
 ;; Work around for an incompatibility (XEmacs 21.4 vs. 21.5), see the
 ;; following threads:
 ;;
@@ -169,7 +107,7 @@ fixed in Emacs 22."
 		 (forward-sexp 1)
 		 (eolp)))))
   ;; The original `with-syntax-table' uses `copy-syntax-table' which
-  ;; doesn't seem to copy modified syntax entries in XEmacs 21.5.
+  ;; doesn't seem to copy modified syntax entries in old XEmacs 21.5.
   (defmacro with-syntax-table (syntab &rest body)
     "Evaluate BODY with the SYNTAB as the current syntax table."
     `(let ((stab (syntax-table)))
@@ -186,15 +124,17 @@ fixed in Emacs 22."
 
 (defalias 'device-sound-enabled-p 'ignore)
 (defalias 'play-sound-file 'ignore)
-(defalias 'nndb-request-article 'ignore)
 (defalias 'efs-re-read-dir 'ignore)
 (defalias 'ange-ftp-re-read-dir 'ignore)
 (defalias 'define-mail-user-agent 'ignore)
 
 (eval-and-compile
   (unless (featurep 'xemacs)
+    (defvar iswitchb-temp-buflist)
     (defalias 'get-popup-menu-response 'ignore)
     (defalias 'event-object 'ignore)
+    (autoload 'iswitchb-read-buffer "iswitchb")
+    (autoload 'netrc-credentials "netrc")
     (defalias 'x-defined-colors 'ignore)
     (defalias 'read-color 'ignore)))
 
@@ -308,7 +248,7 @@ dgnushack-compile."
   ;;(setq byte-compile-dynamic t)
   (unless warn
     (setq byte-compile-warnings
-	  '(free-vars unresolved callargs redefine)))
+	  '(free-vars unresolved callargs redefine suspicious)))
   (let ((files (directory-files srcdir nil "^[^=].*\\.el$"))
 	;;(byte-compile-generate-call-tree t)
 	file elc)
@@ -316,7 +256,7 @@ dgnushack-compile."
     ;; installed.
     (when (featurep 'xemacs)
       (setq gnus-xmas-glyph-directory "dummy"))
-    (dolist (file '("dgnushack.el" "lpath.el"))
+    (dolist (file '(".dir-locals.el" "dgnushack.el" "lpath.el"))
       (setq files (delete file files)))
     (when (featurep 'base64)
       (setq files (delete "base64.el" files)))
@@ -327,6 +267,8 @@ dgnushack-compile."
        (dolist (file '("webmail.el" "nnwfm.el"))
 	 (setq files (delete file files)))))
     (condition-case code
+	;; Under XEmacs 21.4 this loads easy-mmode.elc that provides
+	;; the Emacs functions `propertize' and `replace-regexp-in-string'.
 	(require 'mh-e)
       (error
        (message "No mh-e: %s %s" (cadr code) (or (locate-library "mh-e") ""))
@@ -366,7 +308,7 @@ dgnushack-compile."
       (expand-file-name "auto-autoloads.el")
     (expand-file-name "gnus-load.el")))
 
-(defvar	dgnushack-cus-load-file 
+(defvar	dgnushack-cus-load-file
   (if (featurep 'xemacs)
       (expand-file-name "custom-load.el")
     (expand-file-name "cus-load.el")))
@@ -374,29 +316,22 @@ dgnushack-compile."
 (defun dgnushack-make-cus-load ()
   (load "cus-dep")
   (let ((cusload-base-file dgnushack-cus-load-file))
-    (if (fboundp 'custom-make-dependencies)
-	(custom-make-dependencies)
-      (Custom-make-dependencies))
+    (defadvice directory-files (after exclude-dir-locals activate)
+      "Exclude .dir-locals.el file."
+      (dolist (file ad-return-value)
+	(if (string-match "\\(?:\\`\\|/\\)\\.dir-locals\\.el\\'" file)
+	    (setq ad-return-value (delete file ad-return-value)))))
+    (unwind-protect
+	(if (fboundp 'custom-make-dependencies)
+	    (custom-make-dependencies)
+	  (Custom-make-dependencies))
+      (ad-unadvise 'directory-files))
     (when (featurep 'xemacs)
       (message "Compiling %s..." dgnushack-cus-load-file)
       (byte-compile-file dgnushack-cus-load-file))))
 
 (defun dgnushack-make-auto-load ()
   (require 'autoload)
-  (unless (make-autoload '(define-derived-mode child parent name
-			    "docstring" body)
-			 "file")
-    (defadvice make-autoload (around handle-define-derived-mode activate)
-      "Handle `define-derived-mode'."
-      (if (eq (car-safe (ad-get-arg 0)) 'define-derived-mode)
-	  (setq ad-return-value
-		(list 'autoload
-		      (list 'quote (nth 1 (ad-get-arg 0)))
-		      (ad-get-arg 1)
-		      (nth 4 (ad-get-arg 0))
-		      t nil))
-	ad-do-it))
-    (put 'define-derived-mode 'doc-string-elt 3))
   (let ((generated-autoload-file dgnushack-gnus-load-file)
 	(make-backup-files nil)
 	(autoload-package-name "gnus"))
@@ -405,7 +340,14 @@ dgnushack-compile."
 	    (delete-file generated-autoload-file))
       (with-temp-file generated-autoload-file
 	(insert ?\014)))
-    (batch-update-autoloads)))
+    (defadvice directory-files (after exclude-dir-locals activate)
+      "Exclude .dir-locals.el file."
+      (dolist (file ad-return-value)
+	(if (string-match "\\(?:\\`\\|/\\)\\.dir-locals\\.el\\'" file)
+	    (setq ad-return-value (delete file ad-return-value)))))
+    (unwind-protect
+	(batch-update-autoloads)
+      (ad-unadvise 'directory-files))))
 
 (defun dgnushack-make-load ()
   (unless (featurep 'xemacs)
@@ -551,5 +493,3 @@ or remove them using `make remove-installed-shadows'.\n\n"))))))))
 	(setq path (cdr path))))))
 
 ;;; dgnushack.el ends here
-
-;;; arch-tag: 579f585a-24eb-4e1c-8d34-4808e11b68f2