diff options
author | Kenichi Handa <handa@m17n.org> | 2010-01-27 14:17:35 +0900 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2010-01-27 14:17:35 +0900 |
commit | 86e893e3b6a6ee06c21b4d4bbb21d4cdb8fabb73 (patch) | |
tree | 98298a687d07833e64139d6527b4421f99456b07 | |
parent | 433bdc96cb7234e36f218df1588b17411f54ee57 (diff) | |
parent | 368d3208cfceb42b5ee07c61b4aa5b7d09c9f2bf (diff) | |
download | emacs-86e893e3b6a6ee06c21b4d4bbb21d4cdb8fabb73.tar.gz |
regex.c (analyse_first): Fix setting of fastmap for unibyte pattern string.
-rw-r--r-- | lisp/ChangeLog | 7 | ||||
-rw-r--r-- | lisp/erc/ChangeLog | 9 | ||||
-rw-r--r-- | lisp/erc/erc-backend.el | 10 | ||||
-rw-r--r-- | lisp/erc/erc.el | 4 | ||||
-rw-r--r-- | lisp/vc-annotate.el | 3 | ||||
-rw-r--r-- | lisp/vc-hooks.el | 2 | ||||
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/regex.c | 3 |
8 files changed, 37 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e86aa2a94a..5097af5c1ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 0ba18b68cfb..8daf590ee89 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -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): diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 1ab9467ab3a..8b533b4c255 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -130,6 +130,10 @@ Use `erc-current-nick' to access this.") "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 @@ Make sure you are in an ERC buffer when running this." (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." diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index d2445414c83..b76f486f155 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -5654,11 +5654,13 @@ user input." "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))) diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el index 9f8daad0fde..71839443553 100644 --- a/lisp/vc-annotate.el +++ b/lisp/vc-annotate.el @@ -447,7 +447,8 @@ Return a cons (REV . FILENAME)." (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))))))) diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 60e3619c4b8..b46561428ee 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -89,6 +89,8 @@ An empty list disables VC altogether." :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." diff --git a/src/ChangeLog b/src/ChangeLog index 96dc0066fd9..1b1a9c1ee73 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/regex.c b/src/regex.c index 0dbfa5971b3..bb921a5b519 100644 --- a/src/regex.c +++ b/src/regex.c @@ -4083,8 +4083,7 @@ analyse_first (p, pend, fastmap, multibyte) 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; |