Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
86e893e3
Commit
86e893e3
authored
Jan 27, 2010
by
Kenichi Handa
Browse files
regex.c (analyse_first): Fix setting of fastmap for unibyte pattern string.
parents
433bdc96
368d3208
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
37 additions
and
6 deletions
+37
-6
lisp/ChangeLog
lisp/ChangeLog
+7
-0
lisp/erc/ChangeLog
lisp/erc/ChangeLog
+9
-0
lisp/erc/erc-backend.el
lisp/erc/erc-backend.el
+8
-2
lisp/erc/erc.el
lisp/erc/erc.el
+3
-1
lisp/vc-annotate.el
lisp/vc-annotate.el
+2
-1
lisp/vc-hooks.el
lisp/vc-hooks.el
+2
-0
src/ChangeLog
src/ChangeLog
+5
-0
src/regex.c
src/regex.c
+1
-2
No files found.
lisp/ChangeLog
View file @
86e893e3
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.
...
...
lisp/erc/ChangeLog
View file @
86e893e3
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):
...
...
lisp/erc/erc-backend.el
View file @
86e893e3
...
...
@@ -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."
...
...
lisp/erc/erc.el
View file @
86e893e3
...
...
@@ -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)))
...
...
lisp/vc-annotate.el
View file @
86e893e3
...
...
@@ -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
)))))))
...
...
lisp/vc-hooks.el
View file @
86e893e3
...
...
@@ -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."
...
...
src/ChangeLog
View file @
86e893e3
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
...
...
src/regex.c
View file @
86e893e3
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment