From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Re: Support (or not) for Emacs 21, and XEmacs Date: Fri, 23 Apr 2010 21:03:20 +0200 Message-ID: <630328F0-8CE1-4CDE-8A81-F69A5A02900E@gmail.com> References: <15649C3E-517D-433D-977F-06008C20A4F4@gmail.com> <3658A4B7-E30A-4D7A-9781-C97A01931A13@gmail.com> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes Content-Transfer-Encoding: quoted-printable Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5RJN-0004M2-Gj for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 18:25:25 -0400 Received: from [140.186.70.92] (port=49096 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5RI4-0003iP-JI for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 18:25:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5RHe-0004lZ-AR for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 18:23:39 -0400 Received: from mail-ew0-f214.google.com ([209.85.219.214]:41312) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5RHe-0004ip-4o for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 18:23:38 -0400 Received: by mail-ew0-f214.google.com with SMTP id 6so3227648ewy.32 for ; Fri, 23 Apr 2010 15:23:37 -0700 (PDT) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Michael Sperber Cc: emacs-orgmode@gnu.org Hi Michael, thank you very much for this! I have (sort-of) applied the patch. Please try to make your patches always against the latest git version =20= of Org-mode - we are moveing very fast. - Carsten On Apr 23, 2010, at 5:50 PM, Michael Sperber wrote: > > Carsten Dominik writes: > >> 4. Can you make XEmacs understand mouse-3 instead of button3 ? Or >> maybe it does understand these by now? > > It actually does this now. I've attached a patch that eliminates the > relevant featurep conditionals. > > --=20 > Cheers =3D8-} Mike > Friede, V=F6lkerverst=E4ndigung und =FCberhaupt blabla > 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-=20= > mouse) > + [(mouse-2)] 'org-agenda-goto-mouse) > (org-defkey org-agenda-mode-map > - (if (featurep 'xemacs) [(button3)] [(mouse-3)]) 'org-agenda-show-=20= > 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-=20= > 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-=20= > tree-start) > (define-key org-agenda-mode-map (if (featurep 'xemacs) =20 > [(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-=20 > 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-=20= > 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 =20 > 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") - Carsten