浏览代码

Backport commit 96794d2 from Emacs master branch

Don't quote nil and t in doc strings
96794d2f97cd064e4c2bf4f71459b42558cc8c79
Paul Eggert
Thu May 21 10:06:44 2015 -0700
Paul Eggert 10 年之前
父节点
当前提交
6b04312e85
共有 9 个文件被更改,包括 15 次插入15 次删除
  1. 1 1
      lisp/ob-ruby.el
  2. 1 1
      lisp/org-agenda.el
  3. 1 1
      lisp/org-capture.el
  4. 1 1
      lisp/org-gnus.el
  5. 1 1
      lisp/org-macs.el
  6. 1 1
      lisp/org-protocol.el
  7. 6 6
      lisp/org.el
  8. 2 2
      lisp/ox-odt.el
  9. 1 1
      lisp/ox-texinfo.el

+ 1 - 1
lisp/ob-ruby.el

@@ -58,7 +58,7 @@
   :type 'string)
   :type 'string)
 
 
 (defcustom org-babel-ruby-nil-to 'hline
 (defcustom org-babel-ruby-nil-to 'hline
-  "Replace 'nil' in ruby tables with this before returning."
+  "Replace nil in ruby tables with this before returning."
   :group 'org-babel
   :group 'org-babel
   :version "24.4"
   :version "24.4"
   :package-version '(Org . "8.0")
   :package-version '(Org . "8.0")

+ 1 - 1
lisp/org-agenda.el

@@ -6643,7 +6643,7 @@ The modified list may contain inherited tags, and tags matched by
 
 
 LIST is the list of agenda items formatted by `org-agenda-list'.
 LIST is the list of agenda items formatted by `org-agenda-list'.
 NDAYS is the span of the current agenda view.
 NDAYS is the span of the current agenda view.
-TODAYP is `t' when the current agenda view is on today."
+TODAYP is t when the current agenda view is on today."
   (catch 'exit
   (catch 'exit
     (cond ((not org-agenda-use-time-grid) (throw 'exit list))
     (cond ((not org-agenda-use-time-grid) (throw 'exit list))
 	  ((and todayp (member 'today (car org-agenda-time-grid))))
 	  ((and todayp (member 'today (car org-agenda-time-grid))))

+ 1 - 1
lisp/org-capture.el

@@ -201,7 +201,7 @@ properties are:
 
 
  :clock-resume       Start the interrupted clock when finishing the capture.
  :clock-resume       Start the interrupted clock when finishing the capture.
                      Note that :clock-keep has precedence over :clock-resume.
                      Note that :clock-keep has precedence over :clock-resume.
-                     When setting both to `t', the current clock will run and
+                     When setting both to t, the current clock will run and
                      the previous one will not be resumed.
                      the previous one will not be resumed.
 
 
  :unnarrowed         Do not narrow the target buffer, simply show the
  :unnarrowed         Do not narrow the target buffer, simply show the

+ 1 - 1
lisp/org-gnus.el

@@ -60,7 +60,7 @@ Normally, this translation is done by querying the IMAP server,
 which is usually very fast.  Unfortunately, some (maybe badly
 which is usually very fast.  Unfortunately, some (maybe badly
 configured) IMAP servers don't support this operation quickly.
 configured) IMAP servers don't support this operation quickly.
 So if following a link to a Gnus article takes ages, try setting
 So if following a link to a Gnus article takes ages, try setting
-this variable to `t'."
+this variable to t."
   :group 'org-link-store
   :group 'org-link-store
   :version "24.1"
   :version "24.1"
   :type 'boolean)
   :type 'boolean)

+ 1 - 1
lisp/org-macs.el

@@ -55,7 +55,7 @@
      ,@body))
      ,@body))
 
 
 (defmacro org-called-interactively-p (&optional kind)
 (defmacro org-called-interactively-p (&optional kind)
-  (declare (debug (&optional ("quote" symbolp)))) ;Why not just `t'?
+  (declare (debug (&optional ("quote" symbolp)))) ;Why not just t?
   (if (featurep 'xemacs)
   (if (featurep 'xemacs)
       `(interactive-p)
       `(interactive-p)
     (if (or (> emacs-major-version 23)
     (if (or (> emacs-major-version 23)

+ 1 - 1
lisp/org-protocol.el

@@ -561,7 +561,7 @@ as filename."
         (let ((fname  (expand-file-name (car var))))
         (let ((fname  (expand-file-name (car var))))
           (setq fname (org-protocol-check-filename-for-protocol
           (setq fname (org-protocol-check-filename-for-protocol
 		       fname (member var flist)  client))
 		       fname (member var flist)  client))
-          (if (eq fname t) ;; greedy? We need the `t' return value.
+          (if (eq fname t) ;; greedy? We need the t return value.
               (progn
               (progn
                 (ad-set-arg 0 nil)
                 (ad-set-arg 0 nil)
                 (throw 'greedy t))
                 (throw 'greedy t))

+ 6 - 6
lisp/org.el

@@ -595,7 +595,7 @@ XEmacs user should have this variable set to nil, because
 (defcustom org-loop-over-headlines-in-active-region nil
 (defcustom org-loop-over-headlines-in-active-region nil
   "Shall some commands act upon headlines in the active region?
   "Shall some commands act upon headlines in the active region?
 
 
-When set to `t', some commands will be performed in all headlines
+When set to t, some commands will be performed in all headlines
 within the active region.
 within the active region.
 
 
 When set to `start-level', some commands will be performed in all
 When set to `start-level', some commands will be performed in all
@@ -1575,7 +1575,7 @@ See the manual for examples."
   "Non-nil means Org will display descriptive links.
   "Non-nil means Org will display descriptive links.
 E.g. [[http://orgmode.org][Org website]] will be displayed as
 E.g. [[http://orgmode.org][Org website]] will be displayed as
 \"Org Website\", hiding the link itself and just displaying its
 \"Org Website\", hiding the link itself and just displaying its
-description.  When set to `nil', Org will display the full links
+description.  When set to nil, Org will display the full links
 literally.
 literally.
 
 
 You can interactively set the value of this variable by calling
 You can interactively set the value of this variable by calling
@@ -11562,7 +11562,7 @@ go to the location where the last refiling operation has put the subtree.
 With a numeric prefix argument of `2', refile to the running clock.
 With a numeric prefix argument of `2', refile to the running clock.
 
 
 With a numeric prefix argument of `3', emulate `org-refile-keep'
 With a numeric prefix argument of `3', emulate `org-refile-keep'
-being set to `t' and copy to the target location, don't move it.
+being set to t and copy to the target location, don't move it.
 Beware that keeping refiled entries may result in duplicated ID
 Beware that keeping refiled entries may result in duplicated ID
 properties.
 properties.
 
 
@@ -15545,7 +15545,7 @@ and the new value.")
 
 
 (defun org-entry-put (pom property value)
 (defun org-entry-put (pom property value)
   "Set PROPERTY to VALUE for entry at point-or-marker POM.
   "Set PROPERTY to VALUE for entry at point-or-marker POM.
-If the value is `nil', it is converted to the empty string.
+If the value is nil, it is converted to the empty string.
 If it is not a string, an error is raised."
 If it is not a string, an error is raised."
   (cond ((null value) (setq value ""))
   (cond ((null value) (setq value ""))
 	((not (stringp value))
 	((not (stringp value))
@@ -17759,7 +17759,7 @@ If no number is found, the return value is 0."
 (defcustom org-image-actual-width t
 (defcustom org-image-actual-width t
   "Should we use the actual width of images when inlining them?
   "Should we use the actual width of images when inlining them?
 
 
-When set to `t', always use the image width.
+When set to t, always use the image width.
 
 
 When set to a number, use imagemagick (when available) to set
 When set to a number, use imagemagick (when available) to set
 the image's width to this value.
 the image's width to this value.
@@ -17786,7 +17786,7 @@ This requires Emacs >= 24.1, build with imagemagick support."
 
 
 (defcustom org-agenda-inhibit-startup nil
 (defcustom org-agenda-inhibit-startup nil
   "Inhibit startup when preparing agenda buffers.
   "Inhibit startup when preparing agenda buffers.
-When this variable is `t', the initialization of the Org agenda
+When this variable is t, the initialization of the Org agenda
 buffers is inhibited: e.g. the visibility state is not set, the
 buffers is inhibited: e.g. the visibility state is not set, the
 tables are not re-aligned, etc."
 tables are not re-aligned, etc."
   :type 'boolean
   :type 'boolean

+ 2 - 2
lisp/ox-odt.el

@@ -847,7 +847,7 @@ TABLE-CELL-STYLE-SELECTOR := `use-first-row-styles'       |
                              `use-banding-rows-styles'    |
                              `use-banding-rows-styles'    |
                              `use-banding-columns-styles' |
                              `use-banding-columns-styles' |
                              `use-first-row-styles'
                              `use-first-row-styles'
-ON-OR-OFF                 := `t' | `nil'
+ON-OR-OFF                 := t | nil
 
 
 For example, with the following configuration
 For example, with the following configuration
 
 
@@ -3261,7 +3261,7 @@ contextual information."
   "Retrieve styles applicable to a table cell.
   "Retrieve styles applicable to a table cell.
 R and C are (zero-based) row and column numbers of the table
 R and C are (zero-based) row and column numbers of the table
 cell.  STYLE-SPEC is an entry in `org-odt-table-styles'
 cell.  STYLE-SPEC is an entry in `org-odt-table-styles'
-applicable to the current table.  It is `nil' if the table is not
+applicable to the current table.  It is nil if the table is not
 associated with any style attributes.
 associated with any style attributes.
 
 
 Return a cons of (TABLE-CELL-STYLE-NAME . PARAGRAPH-STYLE-NAME).
 Return a cons of (TABLE-CELL-STYLE-NAME . PARAGRAPH-STYLE-NAME).

+ 1 - 1
lisp/ox-texinfo.el

@@ -117,7 +117,7 @@
 (defcustom org-texinfo-coding-system nil
 (defcustom org-texinfo-coding-system nil
   "Default document encoding for Texinfo output.
   "Default document encoding for Texinfo output.
 
 
-If `nil' it will default to `buffer-file-coding-system'."
+If nil it will default to `buffer-file-coding-system'."
   :group 'org-export-texinfo
   :group 'org-export-texinfo
   :type 'coding-system)
   :type 'coding-system)