Merge from mainline.

1 files changed, 2 insertions, 3 deletions

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 9e49f0e775b..1c1ffc41624 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2801,7 +2801,7 @@ server/database name."
 (defun sql-rename-buffer (&optional new-name)
   "Rename a SQL interactive buffer.
 
-Prompts for the new name if command is preceeded by
+Prompts for the new name if command is preceded by
 \\[universal-argument].  If no buffer name is provided, then the
 `sql-alternate-buffer-name' is used.
 
@@ -3262,7 +3262,7 @@ you must tell Emacs.  Here's how to do that in your `~/.emacs' file:
   :abbrev-table sql-mode-abbrev-table
   (if sql-mode-menu
       (easy-menu-add sql-mode-menu)); XEmacs
-  
+
   (set (make-local-variable 'comment-start) "--")
   ;; Make each buffer in sql-mode remember the "current" SQLi buffer.
   (make-local-variable 'sql-buffer)
@@ -4257,4 +4257,3 @@ buffer.
 (provide 'sql)
 
 ;;; sql.el ends here
-