X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/09d9db2c4921cb2eb0974892164dd03d6bffdd80..becf0483bf5ca42b0aab7533ed02ff21cc509c1a:/lisp/mh-e/mh-acros.el

diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index c1964d5a4e..7abd16bd83 100644
--- 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-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -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