aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-05-14 15:31:36 +0200
committerJuanma Barranquero2010-05-14 15:31:36 +0200
commitc38762fdfb8d81e87f061abe528141f374300b92 (patch)
tree905f347a8f287d0d66c4f2b44684a4d497eabc87
parentb4b6e17e0077ab70fcc967a432cd12e9d24b8720 (diff)
downloademacs-c38762fdfb8d81e87f061abe528141f374300b92.tar.gz
emacs-c38762fdfb8d81e87f061abe528141f374300b92.zip
* progmodes/sql.el: Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/progmodes/sql.el32
2 files changed, 25 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 484ae6529c3..2c98f1ab475 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12010-05-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * progmodes/sql.el (sql-oracle-program): Reflow docstring.
4 (sql-oracle-scan-on, sql-sybase-program, sql-product-font-lock)
5 (sql-add-product-keywords, sql-highlight-product, sql-set-product)
6 (sql-make-alternate-buffer-name, sql-placeholders-filter)
7 (sql-escape-newlines-filter, sql-input-sender)
8 (sql-send-magic-terminator, sql-sybase): Fix typos in docstrings.
9
12010-05-13 Chong Yidong <cyd@stupidchicken.com> 102010-05-13 Chong Yidong <cyd@stupidchicken.com>
2 11
3 Add TeX open-block and close-block keybindings to SGML, and vice 12 Add TeX open-block and close-block keybindings to SGML, and vice
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 1f981e5a3d7..e4df102f542 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -663,9 +663,9 @@ is changed."
663 663
664Starts `sql-interactive-mode' after doing some setup. 664Starts `sql-interactive-mode' after doing some setup.
665 665
666On Windows, \"sqlplus\" usually starts the sqlplus \"GUI\". In order to 666On Windows, \"sqlplus\" usually starts the sqlplus \"GUI\". In order
667start the sqlplus console, use \"plus33\" or something similar. You 667to start the sqlplus console, use \"plus33\" or something similar.
668will find the file in your Orant\\bin directory." 668You will find the file in your Orant\\bin directory."
669 :type 'file 669 :type 'file
670 :group 'SQL) 670 :group 'SQL)
671 671
@@ -690,7 +690,7 @@ will find the file in your Orant\\bin directory."
690 690
691When non-nil, Emacs will scan text sent to sqlplus and prompt 691When non-nil, Emacs will scan text sent to sqlplus and prompt
692for replacement text for & placeholders as sqlplus does. This 692for replacement text for & placeholders as sqlplus does. This
693is needed on Windows where sqlplus output is buffer and the 693is needed on Windows where sqlplus output is buffered and the
694prompts are not shown until after the text is entered. 694prompts are not shown until after the text is entered.
695 695
696You will probably want to issue the following command in sqlplus 696You will probably want to issue the following command in sqlplus
@@ -772,10 +772,10 @@ Starts `sql-interactive-mode' after doing some setup."
772 :version "24.1" 772 :version "24.1"
773 :group 'SQL) 773 :group 'SQL)
774 774
775;; Customization for SyBase 775;; Customization for Sybase
776 776
777(defcustom sql-sybase-program "isql" 777(defcustom sql-sybase-program "isql"
778 "Command to start isql by SyBase. 778 "Command to start isql by Sybase.
779 779
780Starts `sql-interactive-mode' after doing some setup." 780Starts `sql-interactive-mode' after doing some setup."
781 :type 'file 781 :type 'file
@@ -2042,7 +2042,7 @@ See `sql-product-alist' for a list of products and supported features."
2042 (message "`%s' is not a known product; use `sql-add-product' to add it first." product)))) 2042 (message "`%s' is not a known product; use `sql-add-product' to add it first." product))))
2043 2043
2044(defun sql-product-font-lock (keywords-only imenu) 2044(defun sql-product-font-lock (keywords-only imenu)
2045 "Configures font-lock and imenu with product-specific settings. 2045 "Configure font-lock and imenu with product-specific settings.
2046 2046
2047The KEYWORDS-ONLY flag is passed to font-lock to specify whether 2047The KEYWORDS-ONLY flag is passed to font-lock to specify whether
2048only keywords should be hilighted and syntactic hilighting 2048only keywords should be hilighted and syntactic hilighting
@@ -2098,7 +2098,7 @@ also be configured."
2098(defun sql-add-product-keywords (product keywords &optional append) 2098(defun sql-add-product-keywords (product keywords &optional append)
2099 "Add highlighting KEYWORDS for SQL PRODUCT. 2099 "Add highlighting KEYWORDS for SQL PRODUCT.
2100 2100
2101PRODUCT should be a symbol, the name of a sql product, such as 2101PRODUCT should be a symbol, the name of a SQL product, such as
2102`oracle'. KEYWORDS should be a list; see the variable 2102`oracle'. KEYWORDS should be a list; see the variable
2103`font-lock-keywords'. By default they are added at the beginning 2103`font-lock-keywords'. By default they are added at the beginning
2104of the current highlighting list. If optional argument APPEND is 2104of the current highlighting list. If optional argument APPEND is
@@ -2131,7 +2131,7 @@ adds a fontification pattern to fontify identifiers ending in
2131;;; Functions to switch highlighting 2131;;; Functions to switch highlighting
2132 2132
2133(defun sql-highlight-product () 2133(defun sql-highlight-product ()
2134 "Turns on the font highlighting for the SQL product selected." 2134 "Turn on the font highlighting for the SQL product selected."
2135 (when (derived-mode-p 'sql-mode) 2135 (when (derived-mode-p 'sql-mode)
2136 ;; Setup font-lock 2136 ;; Setup font-lock
2137 (sql-product-font-lock nil t) 2137 (sql-product-font-lock nil t)
@@ -2141,7 +2141,7 @@ adds a fontification pattern to fontify identifiers ending in
2141 (symbol-name sql-product)) "]")))) 2141 (symbol-name sql-product)) "]"))))
2142 2142
2143(defun sql-set-product (product) 2143(defun sql-set-product (product)
2144 "Set `sql-product' to product and enable appropriate highlighting." 2144 "Set `sql-product' to PRODUCT and enable appropriate highlighting."
2145 (interactive 2145 (interactive
2146 (list (completing-read "SQL product: " 2146 (list (completing-read "SQL product: "
2147 (mapcar (lambda (info) (symbol-name (car info))) 2147 (mapcar (lambda (info) (symbol-name (car info)))
@@ -2416,7 +2416,7 @@ variable `sql-buffer'. See `sql-help' on how to create such a buffer."
2416 (message "Current SQLi buffer is %s." (buffer-name sql-buffer))))) 2416 (message "Current SQLi buffer is %s." (buffer-name sql-buffer)))))
2417 2417
2418(defun sql-make-alternate-buffer-name () 2418(defun sql-make-alternate-buffer-name ()
2419 "Returns a string that can be used to rename a SQLi buffer. 2419 "Return a string that can be used to rename a SQLi buffer.
2420 2420
2421This is used to set `sql-alternate-buffer-name' within 2421This is used to set `sql-alternate-buffer-name' within
2422`sql-interactive-mode'." 2422`sql-interactive-mode'."
@@ -2475,7 +2475,7 @@ Inserts SELECT or commas if appropriate."
2475 2475
2476(defun sql-placeholders-filter (string) 2476(defun sql-placeholders-filter (string)
2477 "Replace placeholders in STRING. 2477 "Replace placeholders in STRING.
2478Placeholders are words starting with and ampersand like &this." 2478Placeholders are words starting with an ampersand like &this."
2479 2479
2480 (when sql-oracle-scan-on 2480 (when sql-oracle-scan-on
2481 (while (string-match "&\\(\\sw+\\)" string) 2481 (while (string-match "&\\(\\sw+\\)" string)
@@ -2489,7 +2489,7 @@ Placeholders are words starting with and ampersand like &this."
2489;; Using DB2 interactively, newlines must be escaped with " \". 2489;; Using DB2 interactively, newlines must be escaped with " \".
2490;; The space before the backslash is relevant. 2490;; The space before the backslash is relevant.
2491(defun sql-escape-newlines-filter (string) 2491(defun sql-escape-newlines-filter (string)
2492 "Escapes newlines in STRING. 2492 "Escape newlines in STRING.
2493Every newline in STRING will be preceded with a space and a backslash." 2493Every newline in STRING will be preceded with a space and a backslash."
2494 (let ((result "") (start 0) mb me) 2494 (let ((result "") (start 0) mb me)
2495 (while (string-match "\n" string start) 2495 (while (string-match "\n" string start)
@@ -2508,7 +2508,7 @@ Every newline in STRING will be preceded with a space and a backslash."
2508;;; Input sender for SQLi buffers 2508;;; Input sender for SQLi buffers
2509 2509
2510(defun sql-input-sender (proc string) 2510(defun sql-input-sender (proc string)
2511 "Sends STRING to PROC after applying filters." 2511 "Send STRING to PROC after applying filters."
2512 2512
2513 (let* ((product (with-current-buffer (process-buffer proc) sql-product)) 2513 (let* ((product (with-current-buffer (process-buffer proc) sql-product))
2514 (filter (sql-get-product-feature product :input-filter))) 2514 (filter (sql-get-product-feature product :input-filter)))
@@ -2575,7 +2575,7 @@ Every newline in STRING will be preceded with a space and a backslash."
2575 (sql-send-region (point-min) (point-max))) 2575 (sql-send-region (point-min) (point-max)))
2576 2576
2577(defun sql-send-magic-terminator (buf str terminator) 2577(defun sql-send-magic-terminator (buf str terminator)
2578 "Sends TERMINATOR to buffer BUF if its not present in STR." 2578 "Send TERMINATOR to buffer BUF if its not present in STR."
2579 (let (pat term) 2579 (let (pat term)
2580 ;; If flag is merely on(t), get product-specific terminator 2580 ;; If flag is merely on(t), get product-specific terminator
2581 (if (eq terminator t) 2581 (if (eq terminator t)
@@ -2961,7 +2961,7 @@ The default comes from `process-coding-system-alist' and
2961 2961
2962;;;###autoload 2962;;;###autoload
2963(defun sql-sybase () 2963(defun sql-sybase ()
2964 "Run isql by SyBase as an inferior process. 2964 "Run isql by Sybase as an inferior process.
2965 2965
2966If buffer `*SQL*' exists but no process is running, make a new process. 2966If buffer `*SQL*' exists but no process is running, make a new process.
2967If buffer exists and a process is running, just switch to buffer 2967If buffer exists and a process is running, just switch to buffer