X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=dfe44a1be08f419076b15337124f854ef8db5fc0;hb=26c3b2dde98792a08f156f68542767c99554c7f0;hp=f7c11eefbf7e8efdc38c9b58cbd48dcae51bb878;hpb=b0c2b6c2289b6a63bd9b00813ea32617e9103101;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index f7c11eefb..dfe44a1be 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,5 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Version: 4.19
@@ -18,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:
 
@@ -143,12 +141,15 @@
 
 (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)
@@ -333,7 +334,7 @@ This means that every warning will be reported as an error."
 		 ;; lpath.el binds it.
 		 (not (eq (symbol-function 'libxml-parse-html-region)
 			  'ignore)))
-      (dolist (file '("color.el" "shr-color.el" "shr.el"))
+      (dolist (file '("color.el" "shr-color.el" "shr.el" "eww.el"))
 	(setq files (delete file files))))
     (unless (locate-library "epg")
       (setq files (delete "plstore.el" files)))
@@ -564,4 +565,26 @@ but which should be robust in the unexpected case that an error is signaled."
 	   (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