diff options
| author | Juanma Barranquero | 2008-11-23 05:48:41 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-11-23 05:48:41 +0000 |
| commit | d41b91e6955481a6f8046647242c504195eb90fb (patch) | |
| tree | e19482641637d196c1f088df87da4a25d9b36abd | |
| parent | 066b7259c26def3b9e0530a4be7a156f6d1256fe (diff) | |
| download | emacs-d41b91e6955481a6f8046647242c504195eb90fb.tar.gz emacs-d41b91e6955481a6f8046647242c504195eb90fb.zip | |
* allout.el (allout-mode): Fix typo in docstring.
* vc-annotate.el (vc-annotate-warp-revision): Reflow docstring.
(vc-annotate-very-old-color, vc-annotate-display): Fix docstring typos.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/allout.el | 2 | ||||
| -rw-r--r-- | lisp/vc-annotate.el | 15 |
3 files changed, 15 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19f3ac209fa..090df75024f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2008-11-23 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * allout.el (allout-mode): Fix typo in docstring. | ||
| 4 | |||
| 5 | * vc-annotate.el (vc-annotate-warp-revision): Reflow docstring. | ||
| 6 | (vc-annotate-very-old-color, vc-annotate-display): Fix docstring typos. | ||
| 7 | |||
| 1 | 2008-11-23 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2008-11-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 9 | ||
| 3 | * vc-hooks.el (vc-follow-link): Complete last change. | 10 | * vc-hooks.el (vc-follow-link): Complete last change. |
diff --git a/lisp/allout.el b/lisp/allout.el index dd954b748f1..0c60e5424d0 100644 --- a/lisp/allout.el +++ b/lisp/allout.el | |||
| @@ -1830,7 +1830,7 @@ single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) | |||
| 1830 | this special translation, so you can use them to get out of the | 1830 | this special translation, so you can use them to get out of the |
| 1831 | hot-spot and back to normal editing operation. | 1831 | hot-spot and back to normal editing operation. |
| 1832 | 1832 | ||
| 1833 | In allout-mode, the normal beginning-of-line command (\\[allout-beginning-of-line]]) is | 1833 | In allout-mode, the normal beginning-of-line command (\\[allout-beginning-of-line]) is |
| 1834 | replaced with one that makes it easy to get to the hot-spot. If you | 1834 | replaced with one that makes it easy to get to the hot-spot. If you |
| 1835 | repeat it immediately it cycles (if `allout-beginning-of-line-cycles' | 1835 | repeat it immediately it cycles (if `allout-beginning-of-line-cycles' |
| 1836 | is set) to the beginning of the item and then, if you hit it again | 1836 | is set) to the beginning of the item and then, if you hit it again |
diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el index 31a82f95a98..9a0e2be7fda 100644 --- a/lisp/vc-annotate.el +++ b/lisp/vc-annotate.el | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 23 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 24 | 24 | ||
| 25 | ;;; Commentary: | 25 | ;;; Commentary: |
| 26 | ;; | 26 | ;; |
| 27 | 27 | ||
| 28 | (require 'vc-hooks) | 28 | (require 'vc-hooks) |
| 29 | (require 'vc) | 29 | (require 'vc) |
| @@ -100,7 +100,7 @@ all other colors between (excluding black and white)." | |||
| 100 | :group 'vc) | 100 | :group 'vc) |
| 101 | 101 | ||
| 102 | (defcustom vc-annotate-very-old-color "#3F3FFF" | 102 | (defcustom vc-annotate-very-old-color "#3F3FFF" |
| 103 | "Color for lines older than the current color range in \\[vc-annotate]]." | 103 | "Color for lines older than the current color range in \\[vc-annotate]." |
| 104 | :type 'string | 104 | :type 'string |
| 105 | :group 'vc) | 105 | :group 'vc) |
| 106 | 106 | ||
| @@ -512,12 +512,11 @@ revisions after." | |||
| 512 | (defun vc-annotate-warp-revision (revspec) | 512 | (defun vc-annotate-warp-revision (revspec) |
| 513 | "Annotate the revision described by REVSPEC. | 513 | "Annotate the revision described by REVSPEC. |
| 514 | 514 | ||
| 515 | If REVSPEC is a positive integer, warp that many revisions | 515 | If REVSPEC is a positive integer, warp that many revisions forward, |
| 516 | forward, if possible, otherwise echo a warning message. If | ||
| 517 | REVSPEC is a negative integer, warp that many revisions backward, | ||
| 518 | if possible, otherwise echo a warning message. If REVSPEC is a | 516 | if possible, otherwise echo a warning message. If REVSPEC is a |
| 519 | string, then it describes a revision number, so warp to that | 517 | negative integer, warp that many revisions backward, if possible, |
| 520 | revision." | 518 | otherwise echo a warning message. If REVSPEC is a string, then it |
| 519 | describes a revision number, so warp to that revision." | ||
| 521 | (if (not (equal major-mode 'vc-annotate-mode)) | 520 | (if (not (equal major-mode 'vc-annotate-mode)) |
| 522 | (message "Cannot be invoked outside of a vc annotate buffer") | 521 | (message "Cannot be invoked outside of a vc annotate buffer") |
| 523 | (let* ((buf (current-buffer)) | 522 | (let* ((buf (current-buffer)) |
| @@ -591,7 +590,7 @@ or OFFSET if present." | |||
| 591 | 590 | ||
| 592 | (defun vc-annotate-display (ratio &optional offset) | 591 | (defun vc-annotate-display (ratio &optional offset) |
| 593 | "Highlight `vc-annotate' output in the current buffer. | 592 | "Highlight `vc-annotate' output in the current buffer. |
| 594 | RATIO, is the expansion that should be applied to `vc-annotate-color-map'. | 593 | RATIO is the expansion that should be applied to `vc-annotate-color-map'. |
| 595 | The annotations are relative to the current time, unless overridden by OFFSET." | 594 | The annotations are relative to the current time, unless overridden by OFFSET." |
| 596 | (when (/= ratio 1.0) | 595 | (when (/= ratio 1.0) |
| 597 | (set (make-local-variable 'vc-annotate-color-map) | 596 | (set (make-local-variable 'vc-annotate-color-map) |