diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 93ef921..886dacf 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1663,9 +1663,9 @@ The following commands are available:
 (org-defkey org-agenda-mode-map "\C-c\C-x\C-mp"    'org-mobile-push)
 
 (org-defkey org-agenda-mode-map
-  (if (featurep 'xemacs) [(button2)] [(mouse-2)]) 'org-agenda-goto-mouse)
+  [(mouse-2)] 'org-agenda-goto-mouse)
 (org-defkey org-agenda-mode-map
-  (if (featurep 'xemacs) [(button3)] [(mouse-3)]) 'org-agenda-show-mouse)
+  [(mouse-3)] 'org-agenda-show-mouse)
 (when org-agenda-mouse-1-follows-link
   (org-defkey org-agenda-mode-map [follow-link] 'mouse-face))
 (easy-menu-define org-agenda-menu org-agenda-mode-map "Agenda menu"
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 2d68b1a..22624d3 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -1132,7 +1132,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
    '(lambda ()
      (setq org-mouse-context-menu-function 'org-mouse-agenda-context-menu)
      (define-key org-agenda-mode-map
-       (if (featurep 'xemacs) [button3] [mouse-3])
+       [mouse-3]
        'org-mouse-show-context-menu)
      (define-key org-agenda-mode-map [down-mouse-3] 'org-mouse-move-tree-start)
      (define-key org-agenda-mode-map (if (featurep 'xemacs) [(control mouse-4)] [C-mouse-4]) 'org-agenda-earlier)
diff --git a/lisp/org.el b/lisp/org.el
index 7cad962..ebc55fd 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4481,9 +4481,9 @@ The following commands are available:
 
 (defvar org-mouse-map (make-sparse-keymap))
 (org-defkey org-mouse-map
-  (if (featurep 'xemacs) [button2] [mouse-2]) 'org-open-at-mouse)
+  [mouse-2] 'org-open-at-mouse)
 (org-defkey org-mouse-map
-  (if (featurep 'xemacs) [button3] [mouse-3]) 'org-find-file-at-mouse)
+  [mouse-3] 'org-find-file-at-mouse)
 (when org-mouse-1-follows-link
   (org-defkey org-mouse-map [follow-link] 'mouse-face))
 (when org-tab-follows-link
@@ -13590,9 +13590,9 @@ user."
 		 (map (copy-keymap calendar-mode-map))
 		 (minibuffer-local-map (copy-keymap minibuffer-local-map)))
 	    (org-defkey map (kbd "RET") 'org-calendar-select)
-	    (org-defkey map (if (featurep 'xemacs) [button1] [mouse-1])
+	    (org-defkey map [mouse-1]
 			'org-calendar-select-mouse)
-	    (org-defkey map (if (featurep 'xemacs) [button2] [mouse-2])
+	    (org-defkey map [mouse-2]
 			'org-calendar-select-mouse)
 	    (org-defkey minibuffer-local-map [(meta shift left)]
 			(lambda () (interactive)
@@ -17743,7 +17743,7 @@ the functionality can be provided as a fall-back.")
   (org-set-local 'fill-paragraph-function 'org-fill-paragraph)
   ;; Adaptive filling: To get full control, first make sure that
   ;; `adaptive-fill-regexp' never matches.  Then install our own matcher.
-  (unless (local-variable-p 'adaptive-fill-regexp)
+  (unless (local-variable-p 'adaptive-fill-regexp (current-buffer))
     (org-set-local 'org-adaptive-fill-regexp-backup
                    adaptive-fill-regexp))
   (org-set-local 'adaptive-fill-regexp "\000")