[Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/doc-view.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/30 16:15:24

Modified files:
        etc            : NEWS 
        lisp           : ChangeLog doc-view.el 

Log message:
        (doc-view-continuous):
        Rename from `doc-view-continuous-mode'.
        (doc-view-menu): Move "Toggle display" to the top.
        Add submenu "Continuous" with radio buttons "Off"/"On"
        and "Save as Default".
        (doc-view-scroll-up-or-next-page)
        (doc-view-scroll-down-or-previous-page)
        (doc-view-next-line-or-next-page)
        (doc-view-previous-line-or-previous-page): Rename
        `doc-view-continuous-mode' to `doc-view-continuous'.  (Bug#4896)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2129&r2=1.2130
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16770&r2=1.16771
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/doc-view.el?cvsroot=emacs&r1=1.92&r2=1.93

Patches:
Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2129
retrieving revision 1.2130
diff -u -b -r1.2129 -r1.2130
--- etc/NEWS    30 Nov 2009 16:11:18 -0000      1.2129
+++ etc/NEWS    30 Nov 2009 16:14:48 -0000      1.2130
@@ -203,7 +203,7 @@
 
 ** DocView
 
-*** When `doc-view-continuous-mode' is non-nil, scrolling a line
+*** When `doc-view-continuous' is non-nil, scrolling a line
 on the page edge advances to the next/previous page.
 
 ** FIXME mail-user-agent change

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16770
retrieving revision 1.16771
diff -u -b -r1.16770 -r1.16771
--- lisp/ChangeLog      30 Nov 2009 16:11:19 -0000      1.16770
+++ lisp/ChangeLog      30 Nov 2009 16:15:20 -0000      1.16771
@@ -1,5 +1,18 @@
 2009-11-30  Juri Linkov  <address@hidden>
 
+       * doc-view.el (doc-view-continuous):
+       Rename from `doc-view-continuous-mode'.
+       (doc-view-menu): Move "Toggle display" to the top.
+       Add submenu "Continuous" with radio buttons "Off"/"On"
+       and "Save as Default".
+       (doc-view-scroll-up-or-next-page)
+       (doc-view-scroll-down-or-previous-page)
+       (doc-view-next-line-or-next-page)
+       (doc-view-previous-line-or-previous-page): Rename
+       `doc-view-continuous-mode' to `doc-view-continuous'.  (Bug#4896)
+
+2009-11-30  Juri Linkov  <address@hidden>
+
        * comint.el (comint-mode-map): Rebind `M-r' from
        `comint-previous-matching-input' to
        `comint-history-isearch-backward-regexp'.

Index: lisp/doc-view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/doc-view.el,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- lisp/doc-view.el    25 Nov 2009 17:21:15 -0000      1.92
+++ lisp/doc-view.el    30 Nov 2009 16:15:23 -0000      1.93
@@ -222,7 +222,7 @@
   :type 'integer
   :group 'doc-view)
 
-(defcustom doc-view-continuous-mode nil
+(defcustom doc-view-continuous nil
   "In Continuous mode reaching the page edge advances to next/previous page.
 When non-nil, scrolling a line upward at the bottom edge of the page
 moves to the next page, and scrolling a line downward at the top edge
@@ -332,13 +332,23 @@
 (easy-menu-define doc-view-menu doc-view-mode-map
   "Menu for Doc View mode."
   '("DocView"
+    ["Toggle display"          doc-view-toggle-display]
+    ("Continuous"
+     ["Off"                     (setq doc-view-continuous nil)
+      :style radio :selected    (eq doc-view-continuous nil)]
+     ["On"                     (setq doc-view-continuous t)
+      :style radio :selected    (eq doc-view-continuous t)]
+     "---"
+     ["Save as Default"
+      (customize-save-variable 'doc-view-continuous doc-view-continuous) t]
+     )
+    "---"
     ["Set Slice"               doc-view-set-slice-using-mouse]
     ["Set Slice (manual)"      doc-view-set-slice]
     ["Reset Slice"             doc-view-reset-slice]
     "---"
     ["Search"                  doc-view-search]
     ["Search Backwards"         doc-view-search-backward]
-    ["Toggle display"          doc-view-toggle-display]
     ))
 
 (defvar doc-view-minor-mode-map
@@ -433,11 +443,11 @@
 
 (defun doc-view-scroll-up-or-next-page (&optional arg)
   "Scroll page up ARG lines if possible, else goto next page.
-When `doc-view-continuous-mode' is non-nil, scrolling upward
+When `doc-view-continuous' is non-nil, scrolling upward
 at the bottom edge of the page moves to the next page.
 Otherwise, goto next page only on typing SPC (ARG is nil)."
   (interactive "P")
-  (if (or doc-view-continuous-mode (null arg))
+  (if (or doc-view-continuous (null arg))
       (let ((hscroll (window-hscroll))
            (cur-page (doc-view-current-page)))
        (when (= (window-vscroll) (image-scroll-up arg))
@@ -450,11 +460,11 @@
 
 (defun doc-view-scroll-down-or-previous-page (&optional arg)
   "Scroll page down ARG lines if possible, else goto previous page.
-When `doc-view-continuous-mode' is non-nil, scrolling downward
+When `doc-view-continuous' is non-nil, scrolling downward
 at the top edge of the page moves to the previous page.
 Otherwise, goto previous page only on typing DEL (ARG is nil)."
   (interactive "P")
-  (if (or doc-view-continuous-mode (null arg))
+  (if (or doc-view-continuous (null arg))
       (let ((hscroll (window-hscroll))
            (cur-page (doc-view-current-page)))
        (when (= (window-vscroll) (image-scroll-down arg))
@@ -467,10 +477,10 @@
 
 (defun doc-view-next-line-or-next-page (&optional arg)
   "Scroll upward by ARG lines if possible, else goto next page.
-When `doc-view-continuous-mode' is non-nil, scrolling a line upward
+When `doc-view-continuous' is non-nil, scrolling a line upward
 at the bottom edge of the page moves to the next page."
   (interactive "p")
-  (if doc-view-continuous-mode
+  (if doc-view-continuous
       (let ((hscroll (window-hscroll))
            (cur-page (doc-view-current-page)))
        (when (= (window-vscroll) (image-next-line arg))
@@ -483,10 +493,10 @@
 
 (defun doc-view-previous-line-or-previous-page (&optional arg)
   "Scroll downward by ARG lines if possible, else goto previous page.
-When `doc-view-continuous-mode' is non-nil, scrolling a line downward
+When `doc-view-continuous' is non-nil, scrolling a line downward
 at the top edge of the page moves to the previous page."
   (interactive "p")
-  (if doc-view-continuous-mode
+  (if doc-view-continuous
       (let ((hscroll (window-hscroll))
            (cur-page (doc-view-current-page)))
        (when (= (window-vscroll) (image-previous-line arg))