Mercurial > emacs
changeset 106999:eb7555fbea3b
regex.c (analyse_first): Fix setting of fastmap for unibyte pattern string.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 27 Jan 2010 14:17:35 +0900 |
| parents | de2044ac357c (current diff) 40a4dcd1833e (diff) |
| children | 1461bb8d8619 |
| files | src/ChangeLog src/regex.c |
| diffstat | 8 files changed, 37 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jan 25 17:22:45 2010 +0900 +++ b/lisp/ChangeLog Wed Jan 27 14:17:35 2010 +0900 @@ -1,5 +1,12 @@ +2010-01-26 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-hooks.el (vc-path): Mark as obsolete. + 2010-01-25 Dan Nicolaescu <dann@ics.uci.edu> + * vc-annotate.el (vc-annotate-revision-at-line): Compare file + names too. + * vc-bzr.el (vc-bzr-print-log): Use the more compact --line option for the short log. (vc-bzr-log-view-mode): Adjust regexp for the above change.
--- a/lisp/erc/ChangeLog Mon Jan 25 17:22:45 2010 +0900 +++ b/lisp/erc/ChangeLog Wed Jan 27 14:17:35 2010 +0900 @@ -1,3 +1,12 @@ +2010-01-25 Vivek Dasmohapatra <vivek@etla.org> + + * erc-backend.el (erc-session-connector): New var. + (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. + 2009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> * erc.el (erc-display-line-1, erc-process-away):
--- a/lisp/erc/erc-backend.el Mon Jan 25 17:22:45 2010 +0900 +++ b/lisp/erc/erc-backend.el Wed Jan 27 14:17:35 2010 +0900 @@ -130,6 +130,10 @@ "The server name used to connect to for this session.") (make-variable-buffer-local 'erc-session-server) +(defvar erc-session-connector nil + "The function used to connect to this session (nil for the default).") +(make-variable-buffer-local 'erc-session-connector) + (defvar erc-session-port nil "The port used to connect to.") (make-variable-buffer-local 'erc-session-port) @@ -538,8 +542,10 @@ (erc-set-active-buffer (current-buffer)) (setq erc-server-last-sent-time 0) (setq erc-server-lines-sent 0) - (erc-open erc-session-server erc-session-port erc-server-current-nick - erc-session-user-full-name t erc-session-password)))) + (let ((erc-server-connect-function (or erc-session-connector + 'open-network-stream))) + (erc-open erc-session-server erc-session-port erc-server-current-nick + erc-session-user-full-name t erc-session-password))))) (defun erc-server-filter-function (process string) "The process filter for the ERC server."
--- a/lisp/erc/erc.el Mon Jan 25 17:22:45 2010 +0900 +++ b/lisp/erc/erc.el Wed Jan 27 14:17:35 2010 +0900 @@ -5654,11 +5654,13 @@ "Determine the connection and authentication parameters. Sets the buffer local variables: +- `erc-session-connector' - `erc-session-server' - `erc-session-port' - `erc-session-full-name' - `erc-server-current-nick'" - (setq erc-session-server (erc-compute-server server) + (setq erc-session-connector erc-server-connect-function + erc-session-server (erc-compute-server server) erc-session-port (or port erc-default-port) erc-session-user-full-name (erc-compute-full-name name)) (erc-set-current-nick (erc-compute-nick nick)))
--- a/lisp/vc-annotate.el Mon Jan 25 17:22:45 2010 +0900 +++ b/lisp/vc-annotate.el Wed Jan 27 14:17:35 2010 +0900 @@ -447,7 +447,8 @@ (let ((rev-at-line (vc-annotate-extract-revision-at-line))) (if (not rev-at-line) (message "Cannot extract revision number from the current line") - (if (equal (car rev-at-line) vc-annotate-parent-rev) + (if (and (equal (car rev-at-line) vc-annotate-parent-rev) + (string= (cdr rev-at-line) vc-annotate-parent-file)) (message "Already at revision %s" rev-at-line) (vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line)))))))
--- a/lisp/vc-hooks.el Mon Jan 25 17:22:45 2010 +0900 +++ b/lisp/vc-hooks.el Wed Jan 27 14:17:35 2010 +0900 @@ -89,6 +89,8 @@ :type '(repeat directory) :group 'vc) +(make-obsolete 'vc-path "should not be necessary anymore." "23.2") + (defcustom vc-make-backup-files nil "If non-nil, backups of registered files are made as with other files. If nil (the default), files covered by version control don't get backups."
--- a/src/ChangeLog Mon Jan 25 17:22:45 2010 +0900 +++ b/src/ChangeLog Wed Jan 27 14:17:35 2010 +0900 @@ -1,3 +1,8 @@ +2010-01-27 Kenichi Handa <handa@m17n.org> + + * regex.c (analyse_first): Fix setting of fastmap for unibyte + pattern string. + 2010-01-25 Jan Djärv <jan.h.d@swipnet.se> * xfns.c (Fx_create_frame): If frame height is too big, try
--- a/src/regex.c Mon Jan 25 17:22:45 2010 +0900 +++ b/src/regex.c Wed Jan 27 14:17:35 2010 +0900 @@ -4083,8 +4083,7 @@ the corresponding multibyte character. */ int c = RE_CHAR_TO_MULTIBYTE (p[1]); - if (! CHAR_BYTE8_P (c)) - fastmap[CHAR_LEADING_CODE (c)] = 1; + fastmap[CHAR_LEADING_CODE (c)] = 1; } } break;