X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=fb638f785f9f3bfb743d5bc9ab74818f2bdba4dc;hb=70219a78f539a29fc94c8a3591db58f1386099de;hp=c95a9757f6c4e0dd9c531caaf56bd5695684c4cf;hpb=c9a393eeb329a99695566342a9f03b8a30000898;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index c95a9757f..fb638f785 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,7 +1,5 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Version: 4.19
@@ -20,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -33,6 +29,11 @@
 (defalias 'facep 'ignore)
 
 (require 'cl)
+(require 'iswitchb)
+
+(condition-case nil
+    (require 'org-entities)
+  (error nil))
 
 (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)))
@@ -189,18 +127,35 @@ fixed in Emacs 22."
 (defalias 'efs-re-read-dir 'ignore)
 (defalias 'ange-ftp-re-read-dir 'ignore)
 (defalias 'define-mail-user-agent 'ignore)
+(defalias 'debbugs-gnu-summary-mode 'ignore)
+(defvar debbugs-gnu-bug-number nil)
 
 (eval-and-compile
   (unless (featurep 'xemacs)
     (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)))
 
 (eval-and-compile
   (when (featurep 'xemacs)
+    (defvar window-point-insertion-type nil)
     (unless (fboundp 'defadvice)
       (autoload 'defadvice "advice" nil nil 'macro))
+    (unless (boundp 'help-echo-owns-message)
+      (defvar help-echo-owns-message))
+    (unless (boundp 'gnus-registry-enabled)
+      (defvar gnus-registry-enabled nil))
+    (unless (boundp 'mail-dont-reply-to-names)
+      (defvar mail-dont-reply-to-names nil))
+    (unless (fboundp 'url-retrieve-synchronously)
+      (defalias 'url-retrieve-synchronously 'url-retrieve))
+    (unless (fboundp 'url-queue-retrieve)
+      (defun url-queue-retrieve (url callback &optional cbargs silent
+				     inhibit-cookies)
+	(url-retrieve url callback cbargs)))
     (autoload 'Info-directory "info" nil t)
     (autoload 'Info-index "info" nil t)
     (autoload 'Info-index-next "info" nil t)
@@ -223,6 +178,7 @@ fixed in Emacs 22."
     (autoload 'customize-set-variable "cus-edit" nil t)
     (autoload 'customize-variable "cus-edit" nil t)
     (autoload 'debug "debug" nil t)
+    (autoload 'sha1 "sha1")
     (if (featurep 'mule)
 	(unless (locate-library "mule-ccl")
 	  (autoload 'define-ccl-program "ccl" nil nil 'macro))
@@ -242,7 +198,6 @@ fixed in Emacs 22."
     (autoload 'mail-fetch-field "mail-utils")
     (autoload 'make-annotation "annotations")
     (autoload 'make-display-table "disp-table")
-    (autoload 'pgg-snarf-keys-region "pgg" nil t)
     (autoload 'pp "pp")
     (autoload 'ps-despool "ps-print" nil t)
     (autoload 'ps-spool-buffer "ps-print" nil t)
@@ -250,6 +205,18 @@ fixed in Emacs 22."
     (autoload 'read-passwd "passwd")
     (autoload 'regexp-opt "regexp-opt")
     (autoload 'reporter-submit-bug-report "reporter")
+    (if (condition-case nil
+	    (progn
+	      (require 'rot13)
+	      (not (fboundp 'rot13-string)))
+	  (error nil))
+	(defmacro rot13-string (string)
+	  "Return ROT13 encryption of STRING."
+	  `(let ((string ,string))
+	     (with-temp-buffer
+	       (insert string)
+	       (translate-region (point-min) (point-max) ,rot13-display-table)
+	       (buffer-string)))))
     (if (and (emacs-version>= 21 5)
 	     (not (featurep 'sxemacs)))
 	(autoload 'setenv "process" nil t)
@@ -276,6 +243,9 @@ fixed in Emacs 22."
     (defalias 'overlays-in 'ignore)
     (defalias 'replace-dehighlight 'ignore)
     (defalias 'replace-highlight 'ignore)
+    (defalias 'gnutls-available-p 'ignore)
+    (defvar timer-list nil)
+    (defvar scroll-margin 0)
     (defalias 'w3-coding-system-for-mime-charset 'ignore)))
 
 (defun dgnushack-emacs-compile-defcustom-p ()
@@ -292,10 +262,21 @@ in `defcustom' forms."
 	    (search-forward " 'foo '(byte-code " nil t))
 	(kill-buffer outbuf)))))
 
-(when (dgnushack-emacs-compile-defcustom-p)
+(when (and (featurep 'xemacs)
+	   (dgnushack-emacs-compile-defcustom-p))
   (maybe-fbind '(defined-colors face-attribute))
   (maybe-bind '(idna-program installation-directory)))
 
+(when (featurep 'xemacs)
+  (defadvice byte-optimize-apply (before use-mapcan (form) activate)
+    "Replace (apply 'nconc (mapcar ...)) with (mapcan ...)."
+    (let ((last (nth (1- (length form)) form)))
+      (when (and (eq last (third form))
+		 (consp last)
+		 (eq 'mapcar (car last))
+		 (equal (nth 1 form) ''nconc))
+	(setq form (cons 'mapcan (cdr last)))))))
+
 (defun dgnushack-compile-verbosely ()
   "Call dgnushack-compile with warnings ENABLED.  If you are compiling
 patches to gnus, you should consider modifying make.bat to call
@@ -303,19 +284,26 @@ dgnushack-compile-verbosely.  All other users should continue to use
 dgnushack-compile."
   (dgnushack-compile t))
 
-(defun dgnushack-compile (&optional warn)
+(defun dgnushack-compile-error-on-warn ()
+  "Call dgnushack-compile with minimal warnings, but with error-on-warn ENABLED.
+This means that every warning will be reported as an error."
+  (unless (dgnushack-compile nil t)
+    (error "Error during byte compilation (warnings were reported as errors!).")))
+
+(defun dgnushack-compile (&optional warn error-on-warn)
   ;;(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$"))
+	(compilesuccess t)
 	;;(byte-compile-generate-call-tree t)
 	file elc)
     ;; Avoid barfing (from gnus-xmas) because the etc directory is not yet
     ;; 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)))
@@ -326,6 +314,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") ""))
@@ -340,7 +330,17 @@ dgnushack-compile."
 		 '("md5.el")
 	       '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el")))
       (setq files (delete file files)))
-
+    (unless (and (fboundp 'libxml-parse-html-region)
+		 ;; lpath.el binds it.
+		 (not (eq (symbol-function 'libxml-parse-html-region)
+			  'ignore)))
+      (dolist (file '("color.el"))
+	(setq files (delete file files))))
+    (unless (locate-library "epg")
+      (setq files (delete "plstore.el" files)))
+    ;; Temporary code until we fix pcase and defmethod stuff.
+    (when (featurep 'xemacs)
+      (setq files (delete "gnus-icalendar.el" files)))
     (dolist (file files)
       (setq file (expand-file-name file srcdir))
       (when (and (file-exists-p
@@ -353,8 +353,14 @@ dgnushack-compile."
       (when (or (not (file-exists-p
 		      (setq elc (concat (file-name-nondirectory file) "c"))))
 		(file-newer-than-file-p file elc))
-	(ignore-errors
-	  (byte-compile-file file))))))
+	(if error-on-warn
+	    (let ((byte-compile-error-on-warn t))
+	      (unless (ignore-errors
+			(byte-compile-file file))
+		(setq compilesuccess nil)))
+	  (ignore-errors
+	    (byte-compile-file file)))))
+    compilesuccess))
 
 (defun dgnushack-recompile ()
   (require 'gnus)
@@ -365,7 +371,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")))
@@ -373,29 +379,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"))
@@ -404,7 +403,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)
@@ -549,4 +555,38 @@ or remove them using `make remove-installed-shadows'.\n\n"))))))))
 	      (error (princ "failed\n")))))
 	(setq path (cdr path))))))
 
+(unless (fboundp 'with-demoted-errors)
+  (defmacro with-demoted-errors (&rest body)
+    "Run BODY and demote any errors to simple messages.
+If `debug-on-error' is non-nil, run BODY without catching its errors.
+This is to be used around code which is not expected to signal an error
+but which should be robust in the unexpected case that an error is signaled."
+    (declare (debug t) (indent 0))
+    (let ((err (make-symbol "err")))
+      `(condition-case ,err
+	   (progn ,@body)
+	 (error (message "Error: %S" ,err) nil)))))
+
+;; XEmacs's `define-obsolete-variable-alias' takes only two arguments:
+;; (define-obsolete-variable-alias OLDVAR NEWVAR)
+(condition-case nil
+    (progn
+      (defvar dgnushack-obsolete-name nil)
+      (defvar dgnushack-current-name nil)
+      (unwind-protect
+	  (define-obsolete-variable-alias
+	    'dgnushack-obsolete-name 'dgnushack-current-name "0")
+	(makunbound 'dgnushack-obsolete-name)
+	(makunbound 'dgnushack-current-name)))
+  (wrong-number-of-arguments
+   (defadvice define-obsolete-variable-alias (around ignore-rest-args
+						     (oldvar newvar &rest args)
+						     activate)
+     "Ignore arguments other than the 1st and the 2nd ones."
+     ad-do-it)
+   (put 'define-obsolete-variable-alias 'byte-optimizer
+	(lambda (form)
+	  (setcdr (nthcdr 2 form) nil)
+	  form))))
+
 ;;; dgnushack.el ends here