Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

[bpt/emacs.git] / lisp / mh-e / mh-acros.el

diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index d4fd2cc..7d6279e 100644 (file)
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -1,6 +1,6 @@
 ;;; mh-acros.el --- macros used in MH-E
 
-;; Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -25,12 +25,12 @@
 ;;; Commentary:
 
 ;; This file contains all macros that are used in more than one file.
-;; If you run "make recompile" in CVS Emacs and see the message
+;; If you run "make recompile" in Bazaar Emacs and see the message
 ;; "Source is newer than compiled," it is a sign that macro probably
 ;; needs to be moved here.
 
 ;; Historically, it was so named with a silent "m" so that it would be
-;; compiled first. Otherwise, "make recompile" in CVS Emacs would use
+;; compiled first. Otherwise, "make recompile" in Bazaar Emacs would use
 ;; compiled files with stale macro definitions. Later, no-byte-compile
 ;; was added to the Local Variables section to avoid this problem and
 ;; because it's pointless to compile a file full of macros. But we
@@ -132,9 +132,10 @@ check if variable `transient-mark-mode' is active."
                (boundp 'mark-active) mark-active))))
 
 ;; Shush compiler.
-(defvar struct)                         ; XEmacs
-(defvar x)                              ; XEmacs
-(defvar y)                              ; XEmacs
+(mh-do-in-xemacs
+  (defvar struct)
+  (defvar x)
+  (defvar y))
 
 ;;;###mh-autoload
 (defmacro mh-defstruct (name-spec &rest fields)
@@ -232,7 +233,7 @@ preserved."
               (,original-window (selected-window))
               (,original-position (progn
                                    (set-buffer (window-buffer ,event-window))
-                                   (set-marker (make-marker) (point))))
+                                   (point-marker)))
               (,modified-flag (buffer-modified-p))
               (buffer-read-only nil))
          (unwind-protect (progn
@@ -326,5 +327,4 @@ MH-E functions."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: b383b49a-494f-4ed0-a30a-cb6d5d2da4ff
 ;;; mh-acros.el ends here