[PATCH] org.el: Fix bindings of < and > for calendar scrolling

[PATCH] org.el: Fix bindings of < and > for calendar scrolling

[Marco Wahl]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

Dear list,

Find a fix for the bindings of < and > for calendar scrolling for Emacs
25.  The fix is necessary because Emacs 25 dropped some aliases in the
calendar lib, in particular those that have been bound to < and >.

Since the fix is small and clear (AFAICT) and the tests pass I try to
push it directly to maint.


Regards,  Marco
-- 
http://www.wahlzone.de
GPG: 0x0A3AE6F2

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] org.el: Fix bindings of < and > for calendar scrolling --]
[-- Type: text/x-diff, Size: 1175 bytes --]

From 8b63dc950302dad862b9e03bda3854d7d351cac4 Mon Sep 17 00:00:00 2001
From: Marco Wahl <marcowahlsoft@gmail.com>
Date: Mon, 20 Oct 2014 21:47:42 +0200
Subject: [PATCH] org.el: Fix bindings of < and > for calendar scrolling

* lisp/org.el (org-read-date-minibuffer-local-map): Switch to the
  current calendar API for scrolling the calendar.
---
 lisp/org.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 2b5603c..7f4be6b 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16285,10 +16285,10 @@ So these are more for recording a certain time/date."
                   (message "")))
     (org-defkey map ">"
                 (lambda () (interactive)
-                  (org-eval-in-calendar '(scroll-calendar-left 1))))
+                  (org-eval-in-calendar '(calendar-scroll-left 1))))
     (org-defkey map "<"
                 (lambda () (interactive)
-                  (org-eval-in-calendar '(scroll-calendar-right 1))))
+                  (org-eval-in-calendar '(calendar-scroll-right 1))))
     (org-defkey map "\C-v"
                 (lambda () (interactive)
                   (org-eval-in-calendar
-- 
2.1.2

Re: [PATCH] org.el: Fix bindings of < and > for calendar scrolling

[Sebastien Vauban]

Marco Wahl wrote:
> Find a fix for the bindings of < and > for calendar scrolling for Emacs
> 25.  The fix is necessary because Emacs 25 dropped some aliases in the
> calendar lib, in particular those that have been bound to < and >.
>
> diff --git a/lisp/org.el b/lisp/org.el
> index 2b5603c..7f4be6b 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -16285,10 +16285,10 @@ So these are more for recording a certain time/date."
>                    (message "")))
>      (org-defkey map ">"
>                  (lambda () (interactive)
> -                  (org-eval-in-calendar '(scroll-calendar-left 1))))
> +                  (org-eval-in-calendar '(calendar-scroll-left 1))))

Can't you simply write                     'calendar-scroll-left ?

>      (org-defkey map "<"
>                  (lambda () (interactive)
> -                  (org-eval-in-calendar '(scroll-calendar-right 1))))
> +                  (org-eval-in-calendar '(calendar-scroll-right 1))))

Same here?

Best regards,
  Seb

-- 
Sebastien Vauban

Re: [PATCH] org.el: Fix bindings of < and > for calendar scrolling

[Marco Wahl]

Hello Sebastien,

Sebastien Vauban <sva-news@mygooglest.com>
writes:

> Marco Wahl wrote:
>> Find a fix for the bindings of < and > for calendar scrolling for Emacs
>> 25.  The fix is necessary because Emacs 25 dropped some aliases in the
>> calendar lib, in particular those that have been bound to < and >.
>>
>> diff --git a/lisp/org.el b/lisp/org.el
>> index 2b5603c..7f4be6b 100644
>> --- a/lisp/org.el
>> +++ b/lisp/org.el
>> @@ -16285,10 +16285,10 @@ So these are more for recording a certain time/date."
>>                    (message "")))
>>      (org-defkey map ">"
>>                  (lambda () (interactive)
>> -                  (org-eval-in-calendar '(scroll-calendar-left 1))))
>> +                  (org-eval-in-calendar '(calendar-scroll-left 1))))
>
> Can't you simply write                     'calendar-scroll-left ?

No.  This is because org-eval-in-calendar expects a form and not just a
variable.

Your idea to simplyfy the call by dropping the '1' --- i.e. writing
'(calendar-scroll-left) --- sounds good to me.  OTOH there are many
similar lines in org-read-date-minibuffer-local-map which all use the
'1' explicitly.  So I think it would be rather irritating to drop the
'1' in just two locations.


Best regards,  Marco
-- 
http://www.wahlzone.de
GPG: 0x0A3AE6F2

Re: [PATCH] org.el: Fix bindings of < and > for calendar scrolling

[Achim Gratz]

Marco Wahl writes:
> Since the fix is small and clear (AFAICT) and the tests pass I try to
> push it directly to maint.

Please keep maint merged into master.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds

Re: [PATCH] org.el: Fix bindings of < and > for calendar scrolling

[Marco Wahl]

Achim Gratz <Stromeko@nexgo.de> writes:

> Marco Wahl writes:
>> Since the fix is small and clear (AFAICT) and the tests pass I try to
>> push it directly to maint.
>
> Please keep maint merged into master.

Ahh, okay, thanks.  I thought the maintainers would do those merges
automatically.

I just saw that you already did the merge for the commit above.  Thanks!


Best regards,  Marco
-- 
http://www.wahlzone.de
GPG: 0x0A3AE6F2