diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 96 | ||||
| -rw-r--r-- | lisp/abbrev.el | 4 | ||||
| -rw-r--r-- | lisp/calc/calc-graph.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 5 | ||||
| -rw-r--r-- | lisp/erc/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/filecache.el | 10 | ||||
| -rw-r--r-- | lisp/files.el | 12 | ||||
| -rw-r--r-- | lisp/image-mode.el | 2 | ||||
| -rw-r--r-- | lisp/info.el | 3 | ||||
| -rw-r--r-- | lisp/international/mule.el | 3 | ||||
| -rw-r--r-- | lisp/language/indian.el | 15 | ||||
| -rw-r--r-- | lisp/mh-e/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 4 | ||||
| -rw-r--r-- | lisp/org/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 7 | ||||
| -rw-r--r-- | lisp/progmodes/sql.el | 97 | ||||
| -rw-r--r-- | lisp/url/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 17 |
18 files changed, 214 insertions, 94 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fde802367eb..f331e8b07f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,95 @@ +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * international/mule.el (auto-coding-alist): Only purecopy + car of each item, not the whole list (Bug#6083). + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/js.el (js-mode): Make paragraph variables local before + calling c-setup-paragraph-variables (Bug#6071). + +2010-05-08 Eli Zaretskii <eliz@gnu.org> + + * composite.el (compose-region, reference-point-alist): Fix typos + in the doc strings. + +2010-05-08 Alexander Klimov <alserkli@inbox.ru> (tiny change) + + * calc/calc-graph.el (calc-graph-plot): Use the proper form for + gnuplot's "set" command. + +2010-05-08 Juanma Barranquero <lekktu@gmail.com> + + * abbrev.el (last-abbrev-text): Doc fix. + (abbrev-prefix-mark): Don't escape parenthesis. + +2010-05-08 Andreas Schwab <schwab@linux-m68k.org> + + * composite.el (find-composition): Doc fix. + +2010-05-08 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/sql.el (sql-electric-stuff): Fix typo in tag. + (sql-oracle-program, sql-sqlite-options) + (sql-query-placeholders-and-send): Doc fixes. + (sql-set-product, sql-interactive-mode): Reflow docstrings. + (sql-imenu-generic-expression, sql-buffer) + (sql-mode-ansi-font-lock-keywords, sql-mode-oracle-font-lock-keywords) + (sql-mode-postgres-font-lock-keywords, sql-mode-ms-font-lock-keywords) + (sql-mode-sybase-font-lock-keywords) + (sql-mode-informix-font-lock-keywords) + (sql-mode-interbase-font-lock-keywords) + (sql-mode-ingres-font-lock-keywords, sql-mode-solid-font-lock-keywords) + (sql-mode-mysql-font-lock-keywords, sql-mode-sqlite-font-lock-keywords) + (sql-mode-db2-font-lock-keywords, sql-mode-font-lock-keywords) + (sql-product-feature, sql-highlight-product) + (comint-line-beginning-position, sql-rename-buffer) + (sql-toggle-pop-to-buffer-after-send-region sql-oracle) + (sql-sybase, sql-informix, sql-sqlite, sql-mysql, sql-solid) + (sql-ingres, sql-ms, sql-postgres, sql-interbase, sql-db2, sql-linter): + Fix typos in docstrings. + +2010-05-08 Juri Linkov <juri@jurta.org> + + * info.el (Info-fontify-node): Put Info-breadcrumbs to the `display' + property instead of `invisible' and `after-string' (bug#5998). + +2010-05-08 Juri Linkov <juri@jurta.org> + + * image-mode.el (image-mode-as-text): Fix typo in docstring. + +2010-05-08 Juanma Barranquero <lekktu@gmail.com> + + * filecache.el (file-cache-add-directory-list) + (file-cache-add-directory-recursively): Fix typos in docstrings. + +2010-05-08 Kenichi Handa <handa@m17n.org> + + * language/indian.el (gurmukhi-composable-pattern): Fix typo. + (gujarati-composable-pattern): Fix typo. + +2010-05-08 Kenichi Handa <handa@m17n.org> + + * language/indian.el (oriya-composable-pattern) + (tamil-composable-pattern, malayalam-composable-pattern): + Add two-part vowels to "v" (vowel sign). + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * files.el (copy-directory): Handle symlinks (Bug#5982). + +2010-05-08 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC. + (vc-hg-working-revision): Likewise. Use hg parents, not hg parent + (Bug#5846). + +2010-05-08 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string. + + * minibuffer.el (completion-at-point): Doc fix. + 2010-05-08 Stefan Monnier <monnier@iro.umontreal.ca> * electric.el (Electric-command-loop): Minor tweak. @@ -5,6 +97,10 @@ * ebuff-menu.el (electric-buffer-list): Try and make it behave a bit better with dedicated windows. +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-07 Deniz Dogan <deniz.a.m.dogan@gmail.com> (tiny change) Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/abbrev.el b/lisp/abbrev.el index b72bdbb8126..a1fc3f90bf6 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -338,7 +338,7 @@ Expands the abbreviation after defining it." Abbrev to be expanded starts here rather than at beginning of word. This way, you can expand an abbrev with a prefix: insert the prefix, use this command, then insert the abbrev. This command inserts a -temporary hyphen after the prefix \(until the intended abbrev +temporary hyphen after the prefix (until the intended abbrev expansion occurs). If the prefix is itself an abbrev, this command expands it, unless ARG is non-nil. Interactively, ARG is the prefix argument." @@ -460,7 +460,7 @@ Trying to expand an abbrev in any other buffer clears `abbrev-start-location'.") (defvar last-abbrev-text nil "The exact text of the last abbrev expanded. -nil if the abbrev has already been unexpanded.") +It is nil if the abbrev has already been unexpanded.") (defvar last-abbrev-location 0 "The location of the start of the last abbrev expanded.") diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index 673f37b4bf0..9af89ab6c3a 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -345,7 +345,7 @@ "set xlabel\nset ylabel\nset title\n" "set noclip points\nset clip one\nset clip two\n" "set format \"%g\"\nset tics\nset xtics\nset ytics\n" - "set data style linespoints\n" + "set style data linespoints\n" "set nogrid\nset nokey\nset nopolar\n")) (if (>= ver 3) (insert "set surface\nset nocontour\n" diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 6e209156b92..4ef6dab8968 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -628,11 +628,12 @@ considered." (minibuffer-message "Nothing to complete") (let ((completion-annotate-function (plist-get plist :annotate-function))) - (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) (plist-get plist :predicate)))))) - + (defun lisp-completion-at-point (&optional predicate) + "Function used for `completion-at-point-functions' in `emacs-lisp-mode'." ;; FIXME: the `end' could be after point? (let* ((pos (point)) (beg (with-syntax-table emacs-lisp-mode-syntax-table diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 18fc5f188a9..7a29e3d0776 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2. @@ -12,8 +16,8 @@ (erc-server-reconnect): Use it to reconnect via old connector (Bug#4958). - * erc.el (erc-determine-parameters): Save - erc-server-connect-function to erc-session-connector. + * erc.el (erc-determine-parameters): + Save erc-server-connect-function to erc-session-connector. 2009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/filecache.el b/lisp/filecache.el index d8a284d7dce..b4b1e8bd954 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -296,8 +296,8 @@ be added to the cache." (defun file-cache-add-directory-list (directory-list &optional regexp) "Add DIRECTORY-LIST (a list of directory names) to the file cache. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself." +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself." (interactive "XAdd files from directory list: ") (mapcar (lambda (dir) (file-cache-add-directory dir regexp)) @@ -370,10 +370,10 @@ STRING is passed as an argument to the locate command." ;;;###autoload (defun file-cache-add-directory-recursively (dir &optional regexp) "Adds DIR and any subdirectories to the file-cache. -This function does not use any external programs +This function does not use any external programs. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself." +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself." (interactive "DAdd directory: ") (require 'find-lisp) (mapcar diff --git a/lisp/files.el b/lisp/files.el index d14599f574a..83ae91dd63a 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4753,10 +4753,14 @@ this happens by default." (mapc (lambda (file) (let ((target (expand-file-name - (file-name-nondirectory file) newname))) - (if (file-directory-p file) - (copy-directory file target keep-time parents) - (copy-file file target t keep-time)))) + (file-name-nondirectory file) newname)) + (attrs (file-attributes file))) + (cond ((file-directory-p file) + (copy-directory file target keep-time parents)) + ((stringp (car attrs)) ; Symbolic link + (make-symbolic-link (car attrs) target t)) + (t + (copy-file file target t keep-time))))) ;; We do not want to copy "." and "..". (directory-files directory 'full directory-files-no-dot-files-regexp)) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index cd292a8fa3b..dfc96bb4a16 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -392,7 +392,7 @@ displays an image file as text. `image-minor-mode' provides the key to display an image file as the actual image. You can use `image-mode-as-text' in `auto-mode-alist' when you want -to display an image file as text inititally. +to display an image file as text initially. See commands `image-mode' and `image-minor-mode' for more information on these modes." diff --git a/lisp/info.el b/lisp/info.el index 505bf859aba..f526ff22a0e 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -4343,8 +4343,7 @@ the variable `Info-file-list-for-emacs'." (cond ((> Info-breadcrumbs-depth 0) (let ((ov (make-overlay (point-min) (1+ header-end)))) - (overlay-put ov 'invisible t) - (overlay-put ov 'after-string (Info-breadcrumbs)) + (overlay-put ov 'display (Info-breadcrumbs)) (overlay-put ov 'evaporate t))) ((not (bobp)) ;; Hide the punctuation at the end, too. diff --git a/lisp/international/mule.el b/lisp/international/mule.el index ac33d26779f..ef3ef1e2efa 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1690,7 +1690,8 @@ and convert it in the temporary buffer. Otherwise, convert in-place." (defcustom auto-coding-alist ;; .exe and .EXE are added to support archive-mode looking at DOS ;; self-extracting exe archives. - (purecopy '(("\\.\\(\ + (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) + '(("\\.\\(\ arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . no-conversion-multibyte) diff --git a/lisp/language/indian.el b/lisp/language/indian.el index 3414da2e045..84998f9cec8 100644 --- a/lisp/language/indian.el +++ b/lisp/language/indian.el @@ -198,15 +198,14 @@ South Indian language Malayalam is supported in this language environment.")) (defconst gurmukhi-composable-pattern (let ((table - '(("a" . "[\u0A01-\u0A02]") ; SIGN ADAK BINDI .. BINDI - ("A" . "\u0A03]") ; SIGN VISARGA + '(("a" . "[\u0A01-\u0A02\u0A70]") ; SIGN ADAK BINDI .. BINDI, TIPPI + ("A" . "\u0A03") ; SIGN VISARGA ("V" . "[\u0A05-\u0A14]") ; independent vowel ("C" . "[\u0A15-\u0A39\u0A59-\u0A5E]") ; consonant - ("Y" . "[\u0A2F\u0A30\u0A35\u0A39]") ; YA, RA, VA, HA + ("Y" . "[\u0A2F-u0A30\u0A35\u0A39]") ; YA, RA, VA, HA ("n" . "\u0A3C") ; NUKTA ("v" . "[\u0A3E-\u0A4C]") ; vowel sign ("H" . "\u0A4D") ; VIRAMA - ("a" . "\u0A70") ; TIPPI ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ ("X" . "[\u0A00-\u0A7F]")))) ; all coverage @@ -226,7 +225,7 @@ South Indian language Malayalam is supported in this language environment.")) (defconst gujarati-composable-pattern (let ((table '(("a" . "[\u0A81-\u0A82]") ; SIGN CANDRABINDU .. ANUSVARA - ("A" . "\u0A83]") ; SIGN VISARGA + ("A" . "\u0A83") ; SIGN VISARGA ("V" . "[\u0A85-\u0A94\u0AE0-\u0AE1]") ; independent vowel ("C" . "[\u0A95-\u0AB9]") ; consonant ("R" . "\u0AB0") ; RA @@ -258,7 +257,7 @@ South Indian language Malayalam is supported in this language environment.")) ("B" . "[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23-\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38-\u0B39]") ; consonant with below form ("R" . "\u0B30") ; RA ("n" . "\u0B3C") ; NUKTA - ("v" . "[\u0B3E-\u0B44\u0B47\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign + ("v" . "[\u0B3E-\u0B4C\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign ("H" . "\u0B4D") ; VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ @@ -281,7 +280,7 @@ South Indian language Malayalam is supported in this language environment.")) '(("a" . "\u0B82") ; SIGN ANUSVARA ("V" . "[\u0B85-\u0B94]") ; independent vowel ("C" . "[\u0B95-\u0BB9]") ; consonant - ("v" . "[\u0BBE-\u0BC8\u0BD7]") ; vowel sign + ("v" . "[\u0BBE-\u0BCC\u0BD7]") ; vowel sign ("H" . "\u0BCD") ; VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ @@ -351,7 +350,7 @@ South Indian language Malayalam is supported in this language environment.")) ("V" . "[\u0D05-\u0D14\u0D60-\u0D61]") ; independent vowel ("C" . "[\u0D15-\u0D39]") ; consonant ("Y" . "[\u0D2F-\u0D30\u0D32\u0D35]") ; YA, RA, LA, VA - ("v" . "[\u0D3E-\u0D48\u0D57\u0D62-\u0D63]") ; postbase matra + ("v" . "[\u0D3E-\u0D4C\u0D57\u0D62-\u0D63]") ; postbase matra ("H" . "\u0D4D") ; SIGN VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 8ed4279721e..e3c9599b873 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> * mh-show.el (mh-showing-mode): Move function to mh-e.el. diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 4d8a6d0ebc0..3ff89ad206b 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1169,7 +1169,7 @@ Currently supported properties are: `:predicate' a predicate that completion candidates need to satisfy. `:annotation-function' the value to use for `completion-annotate-function'.") -(defun complete-symbol (&optional arg) +(defun completion-at-point (&optional arg) "Perform completion on the text around point. The completion method is determined by `completion-at-point-functions'. @@ -1193,7 +1193,7 @@ language you are using." (completion-in-region start end (nth 2 res) (plist-get plist :predicate)))))))) -(defalias 'completion-at-point 'complete-symbol) +(define-obsolete-function-alias 'complete-symbol 'completion-at-point "24.1") ;;; Key bindings. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 2b29da02580..7b55f97a21b 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-05 Stefan Monnier <monnier@iro.umontreal.ca> * org-table.el (orgtbl-setup): @@ -40,8 +44,7 @@ * org-latex.el (org-export-latex-classes): Update docstring. * org.el (org-format-latex-header): Add cookies to the header. - (org-splice-latex-header): Implement placement according to - cookies. + (org-splice-latex-header): Implement placement according to cookies. 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> @@ -54,8 +57,8 @@ 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> - * org-latex.el (org-export-latex-make-header): Use - `org-splice-latex-header' to build the header. + * org-latex.el (org-export-latex-make-header): + Use `org-splice-latex-header' to build the header. (org-export-latex-classes): Update docstring. * org.el (org-splice-latex-header): New function. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 6bd22e4e6fa..6bd8fbc2442 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3327,6 +3327,13 @@ Key bindings: comment-start-skip "\\(//+\\|/\\*+\\)\\s *") (let ((c-buffer-is-cc-mode t)) + ;; FIXME: These are normally set by `c-basic-common-init'. Should + ;; we call it instead? (Bug#6071) + (make-local-variable 'paragraph-start) + (make-local-variable 'paragraph-separate) + (make-local-variable 'paragraph-ignore-fill-prefix) + (make-local-variable 'adaptive-fill-mode) + (make-local-variable 'adaptive-fill-regexp) (c-setup-paragraph-variables)) (set (make-local-variable 'syntax-begin-function) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index c7aa2291258..e79b13f3fe2 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -419,7 +419,7 @@ send current input in the SQLi buffer to the process. If set to nil, then you must use \\[comint-send-input] in order to send current input in the SQLi buffer to the process." :type '(choice (const :tag "Nothing" nil) - (const :tag "The semikolon `;'" semicolon) + (const :tag "The semicolon `;'" semicolon) (const :tag "The string `go' by itself" go)) :version "20.8" :group 'SQL) @@ -450,9 +450,9 @@ buffer is shown using `display-buffer'." "Define interesting points in the SQL buffer for `imenu'. This is used to set `imenu-generic-expression' when SQL mode is -entered. Subsequent changes to sql-imenu-generic-expression will not -affect existing SQL buffers because imenu-generic-expression is a -local variable.") +entered. Subsequent changes to `sql-imenu-generic-expression' will +not affect existing SQL buffers because imenu-generic-expression is +a local variable.") ;; history file @@ -516,7 +516,7 @@ is changed." Starts `sql-interactive-mode' after doing some setup. -Under NT, \"sqlplus\" usually starts the sqlplus \"GUI\". In order to +On Windows, \"sqlplus\" usually starts the sqlplus \"GUI\". In order to start the sqlplus console, use \"plus33\" or something similar. You will find the file in your Orant\\bin directory. @@ -542,9 +542,7 @@ The program can also specify a TCP connection. See `make-comint'." :group 'SQL) (defcustom sql-sqlite-options nil - "*List of additional options for `sql-sqlite-program'. -The following list of options is reported to make things work -on Windows: \"-C\" \"-t\" \"-f\" \"-n\"." + "*List of additional options for `sql-sqlite-program'." :type '(repeat string) :version "20.8" :group 'SQL) @@ -727,7 +725,7 @@ Starts `sql-interactive-mode' after doing some setup." (defvar sql-buffer nil "Current SQLi buffer. -The global value of sql-buffer is the name of the latest SQLi buffer +The global value of `sql-buffer' is the name of the latest SQLi buffer created. Any SQL buffer created will make a local copy of this value. See `sql-interactive-mode' for more on multiple sessions. If you want to change the SQLi buffer a SQL mode sends its SQL strings to, change @@ -992,8 +990,8 @@ statement. The format of variable should be a valid This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-ansi-font-lock-keywords. You may want to -add functions and PL/SQL keywords.") +you define your own `sql-mode-ansi-font-lock-keywords'. You may want +to add functions and PL/SQL keywords.") (defvar sql-mode-oracle-font-lock-keywords (let ((oracle-functions (sql-keywords-re @@ -1208,7 +1206,7 @@ add functions and PL/SQL keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-oracle-font-lock-keywords. You may want +you define your own `sql-mode-oracle-font-lock-keywords'. You may want to add functions and PL/SQL keywords.") (defvar sql-mode-postgres-font-lock-keywords @@ -1296,7 +1294,7 @@ to add functions and PL/SQL keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-postgres-font-lock-keywords.") +you define your own `sql-mode-postgres-font-lock-keywords'.") (defvar sql-mode-linter-font-lock-keywords (let ((linter-keywords (sql-keywords-re @@ -1482,7 +1480,7 @@ function `regexp-opt'.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-ms-font-lock-keywords.") +you define your own `sql-mode-ms-font-lock-keywords'.") (defvar sql-mode-sybase-font-lock-keywords nil "Sybase SQL keywords used by font-lock. @@ -1490,7 +1488,7 @@ you define your own sql-mode-ms-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-sybase-font-lock-keywords.") +you define your own `sql-mode-sybase-font-lock-keywords'.") (defvar sql-mode-informix-font-lock-keywords nil "Informix SQL keywords used by font-lock. @@ -1498,7 +1496,7 @@ you define your own sql-mode-sybase-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-informix-font-lock-keywords.") +you define your own `sql-mode-informix-font-lock-keywords'.") (defvar sql-mode-interbase-font-lock-keywords nil "Interbase SQL keywords used by font-lock. @@ -1506,7 +1504,7 @@ you define your own sql-mode-informix-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-interbase-font-lock-keywords.") +you define your own `sql-mode-interbase-font-lock-keywords'.") (defvar sql-mode-ingres-font-lock-keywords nil "Ingres SQL keywords used by font-lock. @@ -1514,7 +1512,7 @@ you define your own sql-mode-interbase-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-interbase-font-lock-keywords.") +you define your own `sql-mode-interbase-font-lock-keywords'.") (defvar sql-mode-solid-font-lock-keywords nil "Solid SQL keywords used by font-lock. @@ -1522,7 +1520,7 @@ you define your own sql-mode-interbase-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-solid-font-lock-keywords.") +you define your own `sql-mode-solid-font-lock-keywords'.") (defvar sql-mode-mysql-font-lock-keywords (let ((mysql-funcs (sql-keywords-re @@ -1599,7 +1597,7 @@ you define your own sql-mode-solid-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-mysql-font-lock-keywords.") +you define your own `sql-mode-mysql-font-lock-keywords'.") (defvar sql-mode-sqlite-font-lock-keywords nil "SQLite SQL keywords used by font-lock. @@ -1607,7 +1605,7 @@ you define your own sql-mode-mysql-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-sqlite-font-lock-keywords.") +you define your own `sql-mode-sqlite-font-lock-keywords'.") (defvar sql-mode-db2-font-lock-keywords nil "DB2 SQL keywords used by font-lock. @@ -1615,14 +1613,14 @@ you define your own sql-mode-sqlite-font-lock-keywords.") This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-db2-font-lock-keywords.") +you define your own `sql-mode-db2-font-lock-keywords'.") (defvar sql-mode-font-lock-keywords nil "SQL keywords used by font-lock. Setting this variable directly no longer has any affect. Use `sql-product' and `sql-add-product-keywords' to control the -highlighting rules in sql-mode.") +highlighting rules in SQL mode.") @@ -1631,7 +1629,7 @@ highlighting rules in sql-mode.") (defun sql-product-feature (feature &optional product) "Lookup `feature' needed to support the current SQL product. -See \[sql-product-alist] for a list of products and supported features." +See `sql-product-alist' for a list of products and supported features." (plist-get (cdr (assoc (or product sql-product) sql-product-alist)) @@ -1720,8 +1718,7 @@ adds a fontification pattern to fontify identifiers ending in ;;; Functions to switch highlighting (defun sql-highlight-product () - "Turns on the appropriate font highlighting for the SQL product -selected." + "Turn on the appropriate font highlighting for the SQL product selected." (when (derived-mode-p 'sql-mode) ;; Setup font-lock (sql-product-font-lock nil t) @@ -1730,8 +1727,7 @@ selected." (setq mode-name (concat "SQL[" (prin1-to-string sql-product) "]")))) (defun sql-set-product (product) - "Set `sql-product' to product and enable appropriate -highlighting." + "Set `sql-product' to product and enable appropriate highlighting." (interactive (list (completing-read "Enter SQL product: " (mapcar (lambda (info) (symbol-name (car info))) @@ -1752,7 +1748,7 @@ highlighting." (if (not (fboundp 'comint-line-beginning-position)) ;; comint-line-beginning-position is defined in Emacs 21 (defun comint-line-beginning-position () - "Returns the buffer position of the beginning of the line, after any prompt. + "Return the buffer position of the beginning of the line, after any prompt. The prompt is assumed to be any text at the beginning of the line matching the regular expression `comint-prompt-regexp', a buffer local variable." (save-excursion (comint-bol nil) (point)))) @@ -1974,7 +1970,7 @@ This is used to set `sql-alternate-buffer-name' within sql-database))) (defun sql-rename-buffer () - "Renames a SQLi buffer." + "Rename a SQLi buffer." (interactive) (rename-buffer (format "*SQL: %s*" sql-alternate-buffer-name) t)) @@ -2007,8 +2003,8 @@ Inserts SELECT or commas if appropriate." (insert column) (message "%s" column)))) -;; On NT, SQL*Plus for Oracle turns on full buffering for stdout if it -;; is not attached to a character device; therefore placeholder +;; On Windows, SQL*Plus for Oracle turns on full buffering for stdout +;; if it is not attached to a character device; therefore placeholder ;; replacement by SQL*Plus is fully buffered. The workaround lets ;; Emacs query for the placeholders. @@ -2017,8 +2013,9 @@ Inserts SELECT or commas if appropriate." (defun sql-query-placeholders-and-send (proc string) "Send to PROC input STRING, maybe replacing placeholders. -Placeholders are words starting with and ampersand like &this. -This function is used for `comint-input-sender' if using `sql-oracle' on NT." +Placeholders are words starting with an ampersand like &this. +This function is used for `comint-input-sender' if using +`sql-oracle' on Windows." (while (string-match "&\\(\\sw+\\)" string) (setq string (replace-match (read-from-minibuffer @@ -2104,7 +2101,7 @@ Every newline in STRING will be preceded with a space and a backslash." "Toggle `sql-pop-to-buffer-after-send-region'. If given the optional parameter VALUE, sets -sql-toggle-pop-to-buffer-after-send-region to VALUE." +`sql-toggle-pop-to-buffer-after-send-region' to VALUE." (interactive "P") (if value (setq sql-pop-to-buffer-after-send-region value) @@ -2187,8 +2184,8 @@ you must tell Emacs. Here's how to do that in your `~/.emacs' file: "Major mode to use a SQL interpreter interactively. Do not call this function by yourself. The environment must be -initialized by an entry function specific for the SQL interpreter. See -`sql-help' for a list of available entry functions. +initialized by an entry function specific for the SQL interpreter. +See `sql-help' for a list of available entry functions. \\[comint-send-input] after the end of the process' output sends the text from the end of process to the end of the current line. @@ -2360,7 +2357,7 @@ the variables `sql-user', `sql-password', and `sql-database' as defaults, if set. Additional command line parameters can be stored in the list `sql-oracle-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2392,7 +2389,7 @@ parameters and command options." (nconc (list parameter) sql-oracle-options) sql-oracle-options)) (set-buffer (apply 'make-comint "SQL" sql-oracle-program nil parameter)) - ;; SQL*Plus is buffered on WindowsNT; this handles &placeholders. + ;; SQL*Plus is buffered on Windows; this handles &placeholders. (if (eq window-system 'w32) (setq comint-input-sender 'sql-query-placeholders-and-send)))) @@ -2411,7 +2408,7 @@ the variables `sql-server', `sql-user', `sql-password', and `sql-database' as defaults, if set. Additional command line parameters can be stored in the list `sql-sybase-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2455,7 +2452,7 @@ If buffer exists and a process is running, just switch to buffer Interpreter used comes from variable `sql-informix-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2494,7 +2491,7 @@ the variables `sql-user', `sql-password', `sql-database', and `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-sqlite-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2538,7 +2535,7 @@ the variables `sql-user', `sql-password', `sql-database', and `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-mysql-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2585,7 +2582,7 @@ Interpreter used comes from variable `sql-solid-program'. Login uses the variables `sql-user', `sql-password', and `sql-server' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2627,7 +2624,7 @@ If buffer exists and a process is running, just switch to buffer Interpreter used comes from variable `sql-ingres-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2664,7 +2661,7 @@ variables `sql-user', `sql-password', `sql-database', and `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-ms-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2717,7 +2714,7 @@ the variables `sql-database' and `sql-server' as default, if set. Additional command line parameters can be stored in the list `sql-postgres-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2768,7 +2765,7 @@ Interpreter used comes from variable `sql-interbase-program'. Login uses the variables `sql-user', `sql-password', and `sql-database' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2810,7 +2807,7 @@ If buffer exists and a process is running, just switch to buffer Interpreter used comes from variable `sql-db2-program'. There is not automatic login. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. If you use \\[sql-accumulate-and-indent] to send multiline commands to @@ -2859,7 +2856,7 @@ local connections, `sql-server' refers to the server name from the for this to work). If `sql-password' is an empty string, inl will use an empty password. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. \(Type \\[describe-mode] in the SQL buffer for a list of commands.)" diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 5a79712dfae..552f0703940 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> * url-dired.el (url-dired-minor-mode): Use define-minor-mode. @@ -62,8 +66,8 @@ 2009-09-12 Chong Yidong <cyd@stupidchicken.com> * url-methods.el (url-scheme--registering-proxy): New variable. - (url-scheme-register-proxy, url-scheme-get-property): Avoid - calling url-scheme-register-proxy in an infloop (Bug#4191). + (url-scheme-register-proxy, url-scheme-get-property): + Avoid calling url-scheme-register-proxy in an infloop (Bug#4191). 2009-08-22 Glenn Morris <rgm@gnu.org> diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 6ccfd038ff4..0d72bfa58f8 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -168,12 +168,13 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (condition-case nil ;; Ignore all errors. (let ((process-environment - ;; Avoid localization of messages so we can parse the output. - (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") process-environment))) - - (process-file - "hg" nil t nil - "status" "-A" (file-relative-name file))) + ;; Avoid localization of messages so we + ;; can parse the output. + (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=") + process-environment))) + (process-file + "hg" nil t nil + "status" "-A" (file-relative-name file))) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil))))))) @@ -197,7 +198,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ((status nil) (default-directory (file-name-directory file)) ;; Avoid localization of messages so we can parse the output. - (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") + (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=") process-environment)) (out (with-output-to-string @@ -209,7 +210,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ;; Ignore all errors. (process-file "hg" nil t nil - "parent" "--template" "{rev}" (file-relative-name file))) + "parents" "--template" "{rev}" (file-relative-name file))) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil))))))) |