diff options
| author | Chong Yidong | 2012-04-09 21:05:48 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-09 21:05:48 +0800 |
| commit | fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5 (patch) | |
| tree | eba43d1fa2427a77f1f6b1468838426b33ea5973 /lisp/vc | |
| parent | a18ecafa99e7e7c3caa35ed68dd8a7b9b5d2b8e3 (diff) | |
| download | emacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.tar.gz emacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.zip | |
Remove * characters from the front of variable docstrings.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/add-log.el | 6 | ||||
| -rw-r--r-- | lisp/vc/cvs-status.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-diff.el | 18 | ||||
| -rw-r--r-- | lisp/vc/ediff-init.el | 2 | ||||
| -rw-r--r-- | lisp/vc/emerge.el | 4 | ||||
| -rw-r--r-- | lisp/vc/log-edit.el | 2 | ||||
| -rw-r--r-- | lisp/vc/pcvs-defs.el | 10 |
7 files changed, 22 insertions, 22 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index be7bba54378..b9c3d0d385a 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el | |||
| @@ -1122,17 +1122,17 @@ parentheses." | |||
| 1122 | ;;;###autoload | 1122 | ;;;###autoload |
| 1123 | (defvar add-log-lisp-like-modes | 1123 | (defvar add-log-lisp-like-modes |
| 1124 | '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode) | 1124 | '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode) |
| 1125 | "*Modes that look like Lisp to `add-log-current-defun'.") | 1125 | "Modes that look like Lisp to `add-log-current-defun'.") |
| 1126 | 1126 | ||
| 1127 | ;;;###autoload | 1127 | ;;;###autoload |
| 1128 | (defvar add-log-c-like-modes | 1128 | (defvar add-log-c-like-modes |
| 1129 | '(c-mode c++-mode c++-c-mode objc-mode) | 1129 | '(c-mode c++-mode c++-c-mode objc-mode) |
| 1130 | "*Modes that look like C to `add-log-current-defun'.") | 1130 | "Modes that look like C to `add-log-current-defun'.") |
| 1131 | 1131 | ||
| 1132 | ;;;###autoload | 1132 | ;;;###autoload |
| 1133 | (defvar add-log-tex-like-modes | 1133 | (defvar add-log-tex-like-modes |
| 1134 | '(TeX-mode plain-TeX-mode LaTeX-mode tex-mode) | 1134 | '(TeX-mode plain-TeX-mode LaTeX-mode tex-mode) |
| 1135 | "*Modes that look like TeX to `add-log-current-defun'.") | 1135 | "Modes that look like TeX to `add-log-current-defun'.") |
| 1136 | 1136 | ||
| 1137 | (declare-function c-cpp-define-name "cc-cmds" ()) | 1137 | (declare-function c-cpp-define-name "cc-cmds" ()) |
| 1138 | (declare-function c-defun-name "cc-cmds" ()) | 1138 | (declare-function c-defun-name "cc-cmds" ()) |
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index a80197486a2..f803cc43441 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el | |||
| @@ -395,7 +395,7 @@ the list is a three-string list TAG, KIND, REV." | |||
| 395 | (cvs-tree-use-jisx0208 'jisx0208) | 395 | (cvs-tree-use-jisx0208 'jisx0208) |
| 396 | ((char-displayable-p ?━) 'unicode) | 396 | ((char-displayable-p ?━) 'unicode) |
| 397 | ((char-displayable-p (make-char 'japanese-jisx0208 40 44)) 'jisx0208)) | 397 | ((char-displayable-p (make-char 'japanese-jisx0208 40 44)) 'jisx0208)) |
| 398 | "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'. | 398 | "Non-nil if we should use the graphical glyphs from `japanese-jisx0208'. |
| 399 | Otherwise, default to ASCII chars like +, - and |.") | 399 | Otherwise, default to ASCII chars like +, - and |.") |
| 400 | 400 | ||
| 401 | (defconst cvs-tree-char-space | 401 | (defconst cvs-tree-char-space |
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 37b7fce6f32..6d67356852c 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -101,7 +101,7 @@ the command \\[ediff-show-diff-output]. Use the variable | |||
| 101 | :group 'ediff-diff) | 101 | :group 'ediff-diff) |
| 102 | 102 | ||
| 103 | (ediff-defvar-local ediff-ignore-case nil | 103 | (ediff-defvar-local ediff-ignore-case nil |
| 104 | "*If t, skip over difference regions that differ only in letter case. | 104 | "If t, skip over difference regions that differ only in letter case. |
| 105 | This variable can be set either in .emacs or toggled interactively. | 105 | This variable can be set either in .emacs or toggled interactively. |
| 106 | Use `setq-default' if setting it in .emacs") | 106 | Use `setq-default' if setting it in .emacs") |
| 107 | 107 | ||
| @@ -165,12 +165,12 @@ This variable can be set either in .emacs or toggled interactively. | |||
| 165 | Use `setq-default' if setting it in .emacs") | 165 | Use `setq-default' if setting it in .emacs") |
| 166 | 166 | ||
| 167 | (ediff-defvar-local ediff-ignore-similar-regions nil | 167 | (ediff-defvar-local ediff-ignore-similar-regions nil |
| 168 | "*If t, skip over difference regions that differ only in the white space and line breaks. | 168 | "If t, skip over difference regions that differ only in the white space and line breaks. |
| 169 | This variable can be set either in .emacs or toggled interactively. | 169 | This variable can be set either in .emacs or toggled interactively. |
| 170 | Use `setq-default' if setting it in .emacs") | 170 | Use `setq-default' if setting it in .emacs") |
| 171 | 171 | ||
| 172 | (ediff-defvar-local ediff-auto-refine-limit 14000 | 172 | (ediff-defvar-local ediff-auto-refine-limit 14000 |
| 173 | "*Auto-refine only the regions of this size \(in bytes\) or less.") | 173 | "Auto-refine only the regions of this size \(in bytes\) or less.") |
| 174 | 174 | ||
| 175 | ;;; General | 175 | ;;; General |
| 176 | 176 | ||
| @@ -1288,38 +1288,38 @@ delimiter regions")) | |||
| 1288 | ;;; Word functions used to refine the current diff | 1288 | ;;; Word functions used to refine the current diff |
| 1289 | 1289 | ||
| 1290 | (defvar ediff-forward-word-function 'ediff-forward-word | 1290 | (defvar ediff-forward-word-function 'ediff-forward-word |
| 1291 | "*Function to call to move to the next word. | 1291 | "Function to call to move to the next word. |
| 1292 | Used for splitting difference regions into individual words.") | 1292 | Used for splitting difference regions into individual words.") |
| 1293 | (make-variable-buffer-local 'ediff-forward-word-function) | 1293 | (make-variable-buffer-local 'ediff-forward-word-function) |
| 1294 | 1294 | ||
| 1295 | ;; \240 is Unicode symbol for nonbreakable whitespace | 1295 | ;; \240 is Unicode symbol for nonbreakable whitespace |
| 1296 | (defvar ediff-whitespace " \n\t\f\r\240" | 1296 | (defvar ediff-whitespace " \n\t\f\r\240" |
| 1297 | "*Characters constituting white space. | 1297 | "Characters constituting white space. |
| 1298 | These characters are ignored when differing regions are split into words.") | 1298 | These characters are ignored when differing regions are split into words.") |
| 1299 | (make-variable-buffer-local 'ediff-whitespace) | 1299 | (make-variable-buffer-local 'ediff-whitespace) |
| 1300 | 1300 | ||
| 1301 | (defvar ediff-word-1 | 1301 | (defvar ediff-word-1 |
| 1302 | (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_") | 1302 | (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_") |
| 1303 | "*Characters that constitute words of type 1. | 1303 | "Characters that constitute words of type 1. |
| 1304 | More precisely, [ediff-word-1] is a regexp that matches type 1 words. | 1304 | More precisely, [ediff-word-1] is a regexp that matches type 1 words. |
| 1305 | See `ediff-forward-word' for more details.") | 1305 | See `ediff-forward-word' for more details.") |
| 1306 | (make-variable-buffer-local 'ediff-word-1) | 1306 | (make-variable-buffer-local 'ediff-word-1) |
| 1307 | 1307 | ||
| 1308 | (defvar ediff-word-2 "0-9.," | 1308 | (defvar ediff-word-2 "0-9.," |
| 1309 | "*Characters that constitute words of type 2. | 1309 | "Characters that constitute words of type 2. |
| 1310 | More precisely, [ediff-word-2] is a regexp that matches type 2 words. | 1310 | More precisely, [ediff-word-2] is a regexp that matches type 2 words. |
| 1311 | See `ediff-forward-word' for more details.") | 1311 | See `ediff-forward-word' for more details.") |
| 1312 | (make-variable-buffer-local 'ediff-word-2) | 1312 | (make-variable-buffer-local 'ediff-word-2) |
| 1313 | 1313 | ||
| 1314 | (defvar ediff-word-3 "`'?!:;\"{}[]()" | 1314 | (defvar ediff-word-3 "`'?!:;\"{}[]()" |
| 1315 | "*Characters that constitute words of type 3. | 1315 | "Characters that constitute words of type 3. |
| 1316 | More precisely, [ediff-word-3] is a regexp that matches type 3 words. | 1316 | More precisely, [ediff-word-3] is a regexp that matches type 3 words. |
| 1317 | See `ediff-forward-word' for more details.") | 1317 | See `ediff-forward-word' for more details.") |
| 1318 | (make-variable-buffer-local 'ediff-word-3) | 1318 | (make-variable-buffer-local 'ediff-word-3) |
| 1319 | 1319 | ||
| 1320 | (defvar ediff-word-4 | 1320 | (defvar ediff-word-4 |
| 1321 | (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace) | 1321 | (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace) |
| 1322 | "*Characters that constitute words of type 4. | 1322 | "Characters that constitute words of type 4. |
| 1323 | More precisely, [ediff-word-4] is a regexp that matches type 4 words. | 1323 | More precisely, [ediff-word-4] is a regexp that matches type 4 words. |
| 1324 | See `ediff-forward-word' for more details.") | 1324 | See `ediff-forward-word' for more details.") |
| 1325 | (make-variable-buffer-local 'ediff-word-4) | 1325 | (make-variable-buffer-local 'ediff-word-4) |
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 2de5e4dbdaf..ad6d69ee924 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el | |||
| @@ -594,7 +594,7 @@ highlighted using ASCII flags." | |||
| 594 | (ediff-defvar-local ediff-start-narrowed t | 594 | (ediff-defvar-local ediff-start-narrowed t |
| 595 | "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*") | 595 | "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*") |
| 596 | (ediff-defvar-local ediff-quit-widened t | 596 | (ediff-defvar-local ediff-quit-widened t |
| 597 | "*Non-nil means: when finished, Ediff widens buffers A/B. | 597 | "Non-nil means: when finished, Ediff widens buffers A/B. |
| 598 | Actually, Ediff restores the scope of visibility that existed at startup.") | 598 | Actually, Ediff restores the scope of visibility that existed at startup.") |
| 599 | 599 | ||
| 600 | (defcustom ediff-keep-variants t | 600 | (defcustom ediff-keep-variants t |
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index a48f2afecd5..f6942bc538d 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el | |||
| @@ -524,10 +524,10 @@ replaced by emerge-fast-keymap.") | |||
| 524 | (emerge-defvar-local emerge-old-keymap nil | 524 | (emerge-defvar-local emerge-old-keymap nil |
| 525 | "The original local keymap for the merge buffer.") | 525 | "The original local keymap for the merge buffer.") |
| 526 | (emerge-defvar-local emerge-auto-advance nil | 526 | (emerge-defvar-local emerge-auto-advance nil |
| 527 | "*If non-nil, emerge-select-A and emerge-select-B automatically advance to | 527 | "If non-nil, emerge-select-A and emerge-select-B automatically advance to |
| 528 | the next difference.") | 528 | the next difference.") |
| 529 | (emerge-defvar-local emerge-skip-prefers nil | 529 | (emerge-defvar-local emerge-skip-prefers nil |
| 530 | "*If non-nil, differences for which there is a preference are automatically | 530 | "If non-nil, differences for which there is a preference are automatically |
| 531 | skipped.") | 531 | skipped.") |
| 532 | (emerge-defvar-local emerge-quit-hook nil | 532 | (emerge-defvar-local emerge-quit-hook nil |
| 533 | "Hooks to run in the merge buffer after the merge has been finished. | 533 | "Hooks to run in the merge buffer after the merge has been finished. |
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 54d548c09da..db70f417393 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el | |||
| @@ -161,7 +161,7 @@ can be obtained from `log-edit-files'." | |||
| 161 | "21.1") | 161 | "21.1") |
| 162 | 162 | ||
| 163 | (defvar log-edit-changelog-full-paragraphs cvs-changelog-full-paragraphs | 163 | (defvar log-edit-changelog-full-paragraphs cvs-changelog-full-paragraphs |
| 164 | "*If non-nil, include full ChangeLog paragraphs in the log. | 164 | "If non-nil, include full ChangeLog paragraphs in the log. |
| 165 | This may be set in the ``local variables'' section of a ChangeLog, to | 165 | This may be set in the ``local variables'' section of a ChangeLog, to |
| 166 | indicate the policy for that ChangeLog. | 166 | indicate the policy for that ChangeLog. |
| 167 | 167 | ||
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 80a01f58531..ab45b313bd5 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | ;;;; START OF THINGS TO CHECK WHEN INSTALLING | 33 | ;;;; START OF THINGS TO CHECK WHEN INSTALLING |
| 34 | 34 | ||
| 35 | (defvar cvs-program "cvs" | 35 | (defvar cvs-program "cvs" |
| 36 | "*Name or full path of the cvs executable.") | 36 | "Name or full path of the cvs executable.") |
| 37 | 37 | ||
| 38 | (defvar cvs-version | 38 | (defvar cvs-version |
| 39 | ;; With the divergence of the CVSNT codebase and version numbers, this is | 39 | ;; With the divergence of the CVSNT codebase and version numbers, this is |
| @@ -46,12 +46,12 @@ | |||
| 46 | nil t) | 46 | nil t) |
| 47 | (cons (string-to-number (match-string 1)) | 47 | (cons (string-to-number (match-string 1)) |
| 48 | (string-to-number (match-string 2)))))) | 48 | (string-to-number (match-string 2)))))) |
| 49 | "*Version of `cvs' installed on your system. | 49 | "Version of `cvs' installed on your system. |
| 50 | It must be in the (MAJOR . MINOR) format.") | 50 | It must be in the (MAJOR . MINOR) format.") |
| 51 | 51 | ||
| 52 | ;; FIXME: this is only used by cvs-mode-diff-backup | 52 | ;; FIXME: this is only used by cvs-mode-diff-backup |
| 53 | (defvar cvs-diff-program (or (and (boundp 'diff-command) diff-command) "diff") | 53 | (defvar cvs-diff-program (or (and (boundp 'diff-command) diff-command) "diff") |
| 54 | "*Name or full path of the best diff program you've got. | 54 | "Name or full path of the best diff program you've got. |
| 55 | NOTE: there are some nasty bugs in the context diff variants of some vendor | 55 | NOTE: there are some nasty bugs in the context diff variants of some vendor |
| 56 | versions, such as the one in SunOS-4.") | 56 | versions, such as the one in SunOS-4.") |
| 57 | 57 | ||
| @@ -89,7 +89,7 @@ will select a shared-flag.") | |||
| 89 | "List of flags whose settings is shared among several commands.") | 89 | "List of flags whose settings is shared among several commands.") |
| 90 | 90 | ||
| 91 | (defvar cvs-cvsroot nil | 91 | (defvar cvs-cvsroot nil |
| 92 | "*Specifies where the (current) cvs master repository is. | 92 | "Specifies where the (current) cvs master repository is. |
| 93 | Overrides the environment variable $CVSROOT by sending \" -d dir\" to | 93 | Overrides the environment variable $CVSROOT by sending \" -d dir\" to |
| 94 | all CVS commands. This switch is useful if you have multiple CVS | 94 | all CVS commands. This switch is useful if you have multiple CVS |
| 95 | repositories. It can be set interactively with \\[cvs-change-cvsroot.] | 95 | repositories. It can be set interactively with \\[cvs-change-cvsroot.] |
| @@ -243,7 +243,7 @@ the directory name of the cvs buffer.") | |||
| 243 | ;; Was '(expand-file-name " *cvs-tmp*" dir), but that causes them to | 243 | ;; Was '(expand-file-name " *cvs-tmp*" dir), but that causes them to |
| 244 | ;; become non-hidden if uniquification is done `forward'. | 244 | ;; become non-hidden if uniquification is done `forward'. |
| 245 | " *cvs-tmp*" | 245 | " *cvs-tmp*" |
| 246 | "*Name of the cvs temporary buffer. | 246 | "Name of the cvs temporary buffer. |
| 247 | Output from cvs is placed here for asynchronous commands.") | 247 | Output from cvs is placed here for asynchronous commands.") |
| 248 | 248 | ||
| 249 | (defcustom cvs-idiff-imerge-handlers | 249 | (defcustom cvs-idiff-imerge-handlers |