浏览代码

Make C-v and M-v work when entering date with popup calendar

Requested by Leo.
Carsten Dominik 15 年之前
父节点
当前提交
3352fc0c62
共有 4 个文件被更改,包括 19 次插入2 次删除
  1. 5 0
      doc/ChangeLog
  2. 5 2
      doc/org.texi
  3. 1 0
      lisp/ChangeLog
  4. 8 0
      lisp/org.el

+ 5 - 0
doc/ChangeLog

@@ -1,3 +1,8 @@
+2010-05-10  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.texi (The date/time prompt): Document the new keys `C-v'
+	and `M-v'.
+
 2010-05-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* orgcard.tex: Document inline image toggling.

+ 5 - 2
doc/org.texi

@@ -5173,6 +5173,8 @@ from the minibuffer:
 
 @kindex <
 @kindex >
+@kindex M-v
+@kindex C-v
 @kindex mouse-1
 @kindex S-@key{right}
 @kindex S-@key{left}
@@ -5182,12 +5184,13 @@ from the minibuffer:
 @kindex M-S-@key{left}
 @kindex @key{RET}
 @example
-> / <          @r{Scroll calendar forward/backward by one month.}
+@key{RET}           @r{Choose date at cursor in calendar.}
 mouse-1        @r{Select date by clicking on it.}
 S-@key{right}/@key{left}     @r{One day forward/backward.}
 S-@key{down}/@key{up}     @r{One week forward/backward.}
 M-S-@key{right}/@key{left}   @r{One month forward/backward.}
-@key{RET}           @r{Choose date in calendar.}
+> / <          @r{Scroll calendar forward/backward by one month.}
+M-v / C-v      @r{Scroll calendar forward/backward by 3 months.}
 @end example
 
 @vindex org-read-date-display-live

+ 1 - 0
lisp/ChangeLog

@@ -1,6 +1,7 @@
 2010-05-10  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-replace-escapes): Make sure the cdr is not nil.
+	(org-read-date): Make `M-v' and `C-v' scroll the popup calendar.
 
 2010-05-09  Carsten Dominik  <carsten.dominik@gmail.com>
 

+ 8 - 0
lisp/org.el

@@ -13670,6 +13670,14 @@ user."
 	    (org-defkey minibuffer-local-map "<"
 			(lambda () (interactive)
 			  (org-eval-in-calendar '(scroll-calendar-right 1))))
+	    (org-defkey minibuffer-local-map "\C-v"
+			(lambda () (interactive)
+			  (org-eval-in-calendar
+			   '(calendar-scroll-left-three-months 1))))
+	    (org-defkey minibuffer-local-map "\M-v"
+			(lambda () (interactive)
+			  (org-eval-in-calendar
+			   '(calendar-scroll-right-three-months 1))))
 	    (run-hooks 'org-read-date-minibuffer-setup-hook)
 	    (unwind-protect
 		(progn