Commit 5ba5fb81 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

lisp/progmodes/delphi.el: Fix typos.

parent 62973b41
2011-03-16 Juanma Barranquero <lekktu@gmail.com>
* progmodes/delphi.el (delphi-search-path, delphi-indent-level)
(delphi-verbose, delphi-comment-face, delphi-string-face)
(delphi-keyword-face, delphi-ignore-changes, delphi-indent-line)
(delphi-mode-abbrev-table, delphi-debug-buffer, delphi-tab)
(delphi-find-unit, delphi-find-current-xdef, delphi-fill-comment)
(delphi-new-comment-line, delphi-font-lock-defaults)
(delphi-debug-mode-map, delphi-mode-syntax-table, delphi-mode):
Fix typos in docstrings.
2011-03-15 Ken Manheimer <ken.manheimer@gmail.com>
 
* allout.el (allout-make-topic-prefix) (allout-rebullet-heading):
* allout.el (allout-make-topic-prefix, allout-rebullet-heading):
Invert the roles of character and string values for INSTEAD, so a
string is used for the more common case of a defaulting prompt.
 
......
......@@ -26,14 +26,14 @@
;; To enter Delphi mode when you find a Delphi source file, one must override
;; the auto-mode-alist to associate Delphi with .pas (and .dpr and .dpk)
;; files. Emacs, by default, will otherwise enter Pascal mode. E.g.
;; files. Emacs, by default, will otherwise enter Pascal mode. E.g.
;;
;; (autoload 'delphi-mode "delphi")
;; (setq auto-mode-alist
;; (cons '("\\.\\(pas\\|dpr\\|dpk\\)$" . delphi-mode) auto-mode-alist))
;; To get keyword, comment, and string literal coloring, be sure that font-lock
;; is running. One can manually do M-x font-lock-mode in a Delphi buffer, or
;; is running. One can manually do M-x font-lock-mode in a Delphi buffer, or
;; one can put in .emacs:
;;
;; (add-hook 'delphi-mode-hook 'turn-on-font-lock)
......@@ -56,8 +56,8 @@
;; When you have entered Delphi mode, you may get more info by pressing
;; C-h m.
;; This delphi mode implementation is fairly tolerant of syntax errors, relying
;; as much as possible on the indentation of the previous statement. This also
;; This Delphi mode implementation is fairly tolerant of syntax errors, relying
;; as much as possible on the indentation of the previous statement. This also
;; makes it faster and simpler, since there is less searching for properly
;; constructed beginnings.
......@@ -74,15 +74,16 @@
"True if in debug mode.")
(defcustom delphi-search-path "."
"*Directories to search when finding external units. It is a list of
directory strings. If only a single directory, it can be a single
string instead of a list. If a directory ends in \"...\" then that
directory is recursively searched."
"*Directories to search when finding external units.
It is a list of directory strings. If only a single directory,
it can be a single string instead of a list. If a directory
ends in \"...\" then that directory is recursively searched."
:type 'string
:group 'delphi)
(defcustom delphi-indent-level 3
"*Indentation of Delphi statements with respect to containing block. E.g.
"*Indentation of Delphi statements with respect to containing block.
E.g.
begin
// This is an indent of 3.
......@@ -117,7 +118,7 @@ end; end;"
:group 'delphi)
(defcustom delphi-verbose t ; nil
"*If true then delphi token processing progress is reported to the user."
"*If true then Delphi token processing progress is reported to the user."
:type 'boolean
:group 'delphi)
......@@ -137,17 +138,17 @@ differs from the default."
:group 'delphi)
(defcustom delphi-comment-face 'font-lock-comment-face
"*Face used to color delphi comments."
"*Face used to color Delphi comments."
:type 'face
:group 'delphi)
(defcustom delphi-string-face 'font-lock-string-face
"*Face used to color delphi strings."
"*Face used to color Delphi strings."
:type 'face
:group 'delphi)
(defcustom delphi-keyword-face 'font-lock-keyword-face
"*Face used to color delphi keywords."
"*Face used to color Delphi keywords."
:type 'face
:group 'delphi)
......@@ -720,9 +721,9 @@ routine.")
(delphi-progress-done)))))
(defvar delphi-ignore-changes t
"Internal flag to control if the delphi-mode responds to buffer changes.
Defaults to t in case the delphi-after-change function is called on a
non-delphi buffer. Set to nil in a delphi buffer. To override, just do:
"Internal flag to control if the Delphi mode responds to buffer changes.
Defaults to t in case the `delphi-after-change' function is called on a
non-Delphi buffer. Set to nil in a Delphi buffer. To override, just do:
(let ((delphi-ignore-changes t)) ...)")
(defun delphi-after-change (change-start change-end old-length)
......@@ -1521,8 +1522,8 @@ non-delphi buffer. Set to nil in a delphi buffer. To override, just do:
indent)))
(defun delphi-indent-line ()
"Indent the current line according to the current language construct. If
before the indent, the point is moved to the indent."
"Indent the current line according to the current language construct.
If before the indent, the point is moved to the indent."
(interactive)
(delphi-save-match-data
(let ((marked-point (point-marker)) ; Maintain our position reliably.
......@@ -1547,7 +1548,7 @@ before the indent, the point is moved to the indent."
(set-marker marked-point nil))))
(defvar delphi-mode-abbrev-table nil
"Abbrev table in use in delphi-mode buffers.")
"Abbrev table in use in Delphi mode buffers.")
(define-abbrev-table 'delphi-mode-abbrev-table ())
(defmacro delphi-ensure-buffer (buffer-var buffer-name)
......@@ -1568,7 +1569,7 @@ before the indent, the point is moved to the indent."
;; Debugging helpers:
(defvar delphi-debug-buffer nil
"Buffer to write delphi-mode debug messages to. Created on demand.")
"Buffer to write Delphi mode debug messages to. Created on demand.")
(defun delphi-debug-log (format-string &rest args)
;; Writes a message to the log buffer.
......@@ -1679,7 +1680,7 @@ before the indent, the point is moved to the indent."
(defun delphi-tab ()
"Indent the region, when Transient Mark mode is enabled and the region is
active. Otherwise, indent the current line or insert a TAB, depending on the
active. Otherwise, indent the current line or insert a TAB, depending on the
value of `delphi-tab-always-indents' and the current line position."
(interactive)
(cond ((use-region-p)
......@@ -1768,8 +1769,8 @@ value of `delphi-tab-always-indents' and the current line position."
nil))
(defun delphi-find-unit (unit)
"Finds the specified delphi source file according to `delphi-search-path'.
If no extension is specified, .pas is assumed. Creates a buffer for the unit."
"Find the specified Delphi source file according to `delphi-search-path'.
If no extension is specified, .pas is assumed. Creates a buffer for the unit."
(interactive "sDelphi unit name: ")
(let* ((unit-file (if (string-match "^\\(.*\\)\\.[a-z]+$" unit)
unit
......@@ -1791,7 +1792,7 @@ If no extension is specified, .pas is assumed. Creates a buffer for the unit."
"Find the definition of the identifier under the current point, searching
in external units if necessary (as listed in the current unit's use clause).
The set of directories to search for a unit is specified by the global variable
delphi-search-path."
`delphi-search-path'."
(interactive)
(error "delphi-find-current-xdef: not implemented yet"))
......@@ -1802,7 +1803,7 @@ it is a routine."
(error "delphi-find-current-body: not implemented yet"))
(defun delphi-fill-comment ()
"Fills the text of the current comment, according to `fill-column'.
"Fill the text of the current comment, according to `fill-column'.
An error is raised if not in a comment."
(interactive)
(save-excursion
......@@ -1888,8 +1889,8 @@ An error is raised if not in a comment."
(delphi-progress-done)))))))
(defun delphi-new-comment-line ()
"If in a // comment, does a newline, indented such that one is still in the
comment block. If not in a // comment, just does a normal newline."
"If in a // comment, do a newline, indented such that one is still in the
comment block. If not in a // comment, just does a normal newline."
(interactive)
(let ((comment (delphi-current-token)))
(if (not (eq 'comment-single-line (delphi-token-kind comment)))
......@@ -1923,7 +1924,7 @@ comment block. If not in a // comment, just does a normal newline."
nil ; Syntax begin movement doesn't apply
(font-lock-fontify-region-function . delphi-fontify-region)
(font-lock-verbose . delphi-fontifying-progress-step))
"Delphi mode font-lock defaults. Syntactic fontification is ignored.")
"Delphi mode font-lock defaults. Syntactic fontification is ignored.")
(defvar delphi-debug-mode-map
(let ((kmap (make-sparse-keymap)))
......@@ -1944,7 +1945,7 @@ comment block. If not in a // comment, just does a normal newline."
("x" delphi-debug-show-is-stable)
))
kmap)
"Keystrokes for delphi-mode debug commands.")
"Keystrokes for Delphi mode debug commands.")
(defvar delphi-mode-map
(let ((kmap (make-sparse-keymap)))
......@@ -1964,7 +1965,7 @@ comment block. If not in a // comment, just does a normal newline."
"Keymap used in Delphi mode.")
(defconst delphi-mode-syntax-table (make-syntax-table)
"Delphi mode's syntax table. It is just a standard syntax table.
"Delphi mode's syntax table. It is just a standard syntax table.
This is ok since we do our own keyword/comment/string face coloring.")
;;;###autoload
......@@ -1976,7 +1977,7 @@ This is ok since we do our own keyword/comment/string face coloring.")
\\[delphi-fill-comment]\t- Fill the current comment.
\\[delphi-new-comment-line]\t- If in a // comment, do a new comment line.
M-x indent-region also works for indenting a whole region.
\\[indent-region] also works for indenting a whole region.
Customization:
......@@ -1996,21 +1997,21 @@ Customization:
`delphi-search-path' (default .)
Directories to search when finding external units.
`delphi-verbose' (default nil)
If true then delphi token processing progress is reported to the user.
If true then Delphi token processing progress is reported to the user.
Coloring:
`delphi-comment-face' (default font-lock-comment-face)
Face used to color delphi comments.
Face used to color Delphi comments.
`delphi-string-face' (default font-lock-string-face)
Face used to color delphi strings.
Face used to color Delphi strings.
`delphi-keyword-face' (default font-lock-keyword-face)
Face used to color delphi keywords.
Face used to color Delphi keywords.
`delphi-other-face' (default nil)
Face used to color everything else.
Turning on Delphi mode calls the value of the variable delphi-mode-hook with
no args, if that value is non-nil."
Turning on Delphi mode calls the value of the variable `delphi-mode-hook'
with no args, if that value is non-nil."
(interactive)
(kill-all-local-variables)
(use-local-map delphi-mode-map)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment