commit: Fix a couple of bugs, #'query-coding-region, #'query-coding-string.
16 years, 1 month
Aidan Kehoe
changeset: 4596:4fc32a3a086efffb57b45f49ac1867f4ecf69bbe
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Wed Feb 04 12:14:38 2009 +0000
files: lisp/ChangeLog lisp/coding.el lisp/mule/general-late.el
description:
Fix a couple of bugs, #'query-coding-region, #'query-coding-string.
2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
* coding.el (query-coding-region):
Revert this to being a defun, add a compiler macro without
needless binding.
(query-coding-string):
Correct a bug here, string indices are zero- not one-based.
* mule/general-late.el (unicode-query-coding-skip-chars-arg):
Correct the algorithm used to initialise this variable.
diff -r a1a8728fec10bb035ad37b3a21b248dee9d11ef6 -r 4fc32a3a086efffb57b45f49ac1867f4ecf69bbe lisp/ChangeLog
--- a/lisp/ChangeLog Wed Feb 04 11:38:25 2009 +0000
+++ b/lisp/ChangeLog Wed Feb 04 12:14:38 2009 +0000
@@ -1,3 +1,13 @@ 2009-02-04 Aidan Kehoe <kehoea@parhasa
+2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * coding.el (query-coding-region):
+ Revert this to being a defun, add a compiler macro without
+ needless binding.
+ (query-coding-string):
+ Correct a bug here, string indices are zero- not one-based.
+ * mule/general-late.el (unicode-query-coding-skip-chars-arg):
+ Correct the algorithm used to initialise this variable.
+
2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (describe-function-1):
diff -r a1a8728fec10bb035ad37b3a21b248dee9d11ef6 -r 4fc32a3a086efffb57b45f49ac1867f4ecf69bbe lisp/coding.el
--- a/lisp/coding.el Wed Feb 04 11:38:25 2009 +0000
+++ b/lisp/coding.el Wed Feb 04 12:14:38 2009 +0000
@@ -398,8 +398,8 @@ addition, characters that can be safely
(values nil ranges)
(values t nil))))))
-(defsubst query-coding-region (start end coding-system &optional buffer
- errorp highlight)
+(defun query-coding-region (start end coding-system &optional buffer
+ errorp highlight)
"Work out whether CODING-SYSTEM can losslessly encode a region.
START and END are the beginning and end of the region to check.
@@ -423,7 +423,15 @@ describing the positions of the unencoda
#'default-query-coding-region)
start end coding-system buffer errorp highlight))
-(defsubst query-coding-string (string coding-system &optional errorp highlight)
+(define-compiler-macro query-coding-region (start end coding-system
+ &optional buffer errorp highlight)
+ `(funcall (or (coding-system-get ,coding-system 'query-coding-function)
+ #'default-query-coding-region)
+ ,start ,end ,coding-system ,@(append (if buffer (list buffer))
+ (if errorp (list errorp))
+ (if highlight (list highlight)))))
+
+(defun query-coding-string (string coding-system &optional errorp highlight)
"Work out whether CODING-SYSTEM can losslessly encode STRING.
CODING-SYSTEM is the coding system to check.
@@ -442,9 +450,21 @@ describing the positions of the unencoda
`make-range-table'."
(with-temp-buffer
(insert string)
- (query-coding-region (point-min) (point-max) coding-system (current-buffer)
- ;; ### Will highlight work here?
- errorp highlight)))
+ (multiple-value-bind (result ranges)
+ (query-coding-region (point-min) (point-max) coding-system
+ (current-buffer) errorp
+ ;; #### Highlight won't work here,
+ ;; query-coding-region may need to be modified.
+ highlight)
+ (unless result
+ ;; Sigh, string indices are zero-based, buffer offsets are
+ ;; one-based.
+ (map-range-table
+ #'(lambda (begin end value)
+ (remove-range-table begin end ranges)
+ (put-range-table (1- begin) (1- end) value ranges))
+ ranges))
+ (values result ranges))))
;; Function docstring and API are taken from GNU coding.c version 1.353, GPLv2.
(defun unencodable-char-position (start end coding-system
diff -r a1a8728fec10bb035ad37b3a21b248dee9d11ef6 -r 4fc32a3a086efffb57b45f49ac1867f4ecf69bbe lisp/mule/general-late.el
--- a/lisp/mule/general-late.el Wed Feb 04 11:38:25 2009 +0000
+++ b/lisp/mule/general-late.el Wed Feb 04 12:14:38 2009 +0000
@@ -71,7 +71,7 @@
unicode-query-coding-skip-chars-arg
(eval-when-compile
- (when-fboundp #'map-charset-chars
+ (when-fboundp 'map-charset-chars
(loop
for charset in (charset-list)
with skip-chars-string = ""
@@ -80,17 +80,16 @@
(map-charset-chars
#'(lambda (begin end)
(loop
- while (/= end begin)
+ while (and begin (>= end begin))
do
(when (= -1 (char-to-unicode begin))
- (setq this-charset-works nil)
(return-from no-ucs-mapping))
(setq begin (int-to-char (1+ begin)))))
charset)
(setq skip-chars-string
(concat skip-chars-string
(charset-skip-chars-string charset))))
- finally return (skip-chars-quote skip-chars-string)))))
+ finally return skip-chars-string))))
;; At this point in the dump, all the charsets have been loaded. Now, load
;; their Unicode mappings.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Fix a couple of bugs, #'query-coding-region, #'query-coding-string.
16 years, 1 month
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
This gives a huge speed improvement when checking whether Unihan.txt can be
encoded by a Unicode coding system, it’s now down to one second on my
machine versus three minutes and three seconds previously. Current GNU has
the code in C and does it in a fraction of a second.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1233749678 0
# Node ID 4fc32a3a086efffb57b45f49ac1867f4ecf69bbe
# Parent a1a8728fec10bb035ad37b3a21b248dee9d11ef6
Fix a couple of bugs, #'query-coding-region, #'query-coding-string.
2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
* coding.el (query-coding-region):
Revert this to being a defun, add a compiler macro without
needless binding.
(query-coding-string):
Correct a bug here, string indices are zero- not one-based.
* mule/general-late.el (unicode-query-coding-skip-chars-arg):
Correct the algorithm used to initialise this variable.
diff -r a1a8728fec10 -r 4fc32a3a086e lisp/ChangeLog
--- a/lisp/ChangeLog Wed Feb 04 11:38:25 2009 +0000
+++ b/lisp/ChangeLog Wed Feb 04 12:14:38 2009 +0000
@@ -1,3 +1,13 @@
+2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * coding.el (query-coding-region):
+ Revert this to being a defun, add a compiler macro without
+ needless binding.
+ (query-coding-string):
+ Correct a bug here, string indices are zero- not one-based.
+ * mule/general-late.el (unicode-query-coding-skip-chars-arg):
+ Correct the algorithm used to initialise this variable.
+
2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (describe-function-1):
diff -r a1a8728fec10 -r 4fc32a3a086e lisp/coding.el
--- a/lisp/coding.el Wed Feb 04 11:38:25 2009 +0000
+++ b/lisp/coding.el Wed Feb 04 12:14:38 2009 +0000
@@ -398,8 +398,8 @@
(values nil ranges)
(values t nil))))))
-(defsubst query-coding-region (start end coding-system &optional buffer
- errorp highlight)
+(defun query-coding-region (start end coding-system &optional buffer
+ errorp highlight)
"Work out whether CODING-SYSTEM can losslessly encode a region.
START and END are the beginning and end of the region to check.
@@ -423,7 +423,15 @@
#'default-query-coding-region)
start end coding-system buffer errorp highlight))
-(defsubst query-coding-string (string coding-system &optional errorp highlight)
+(define-compiler-macro query-coding-region (start end coding-system
+ &optional buffer errorp highlight)
+ `(funcall (or (coding-system-get ,coding-system 'query-coding-function)
+ #'default-query-coding-region)
+ ,start ,end ,coding-system ,@(append (if buffer (list buffer))
+ (if errorp (list errorp))
+ (if highlight (list highlight)))))
+
+(defun query-coding-string (string coding-system &optional errorp highlight)
"Work out whether CODING-SYSTEM can losslessly encode STRING.
CODING-SYSTEM is the coding system to check.
@@ -442,9 +450,21 @@
`make-range-table'."
(with-temp-buffer
(insert string)
- (query-coding-region (point-min) (point-max) coding-system (current-buffer)
- ;; ### Will highlight work here?
- errorp highlight)))
+ (multiple-value-bind (result ranges)
+ (query-coding-region (point-min) (point-max) coding-system
+ (current-buffer) errorp
+ ;; #### Highlight won't work here,
+ ;; query-coding-region may need to be modified.
+ highlight)
+ (unless result
+ ;; Sigh, string indices are zero-based, buffer offsets are
+ ;; one-based.
+ (map-range-table
+ #'(lambda (begin end value)
+ (remove-range-table begin end ranges)
+ (put-range-table (1- begin) (1- end) value ranges))
+ ranges))
+ (values result ranges))))
;; Function docstring and API are taken from GNU coding.c version 1.353, GPLv2.
(defun unencodable-char-position (start end coding-system
diff -r a1a8728fec10 -r 4fc32a3a086e lisp/mule/general-late.el
--- a/lisp/mule/general-late.el Wed Feb 04 11:38:25 2009 +0000
+++ b/lisp/mule/general-late.el Wed Feb 04 12:14:38 2009 +0000
@@ -71,7 +71,7 @@
unicode-query-coding-skip-chars-arg
(eval-when-compile
- (when-fboundp #'map-charset-chars
+ (when-fboundp 'map-charset-chars
(loop
for charset in (charset-list)
with skip-chars-string = ""
@@ -80,17 +80,16 @@
(map-charset-chars
#'(lambda (begin end)
(loop
- while (/= end begin)
+ while (and begin (>= end begin))
do
(when (= -1 (char-to-unicode begin))
- (setq this-charset-works nil)
(return-from no-ucs-mapping))
(setq begin (int-to-char (1+ begin)))))
charset)
(setq skip-chars-string
(concat skip-chars-string
(charset-skip-chars-string charset))))
- finally return (skip-chars-quote skip-chars-string)))))
+ finally return skip-chars-string))))
;; At this point in the dump, all the charsets have been loaded. Now, load
;; their Unicode mappings.
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Distinguish between special forms and subrs, #'describe-function-1
16 years, 1 month
Aidan Kehoe
APPROVE COMMIT
NOTE: this patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1233747505 0
# Node ID a1a8728fec10bb035ad37b3a21b248dee9d11ef6
# Parent 2986723ac32dc7f0328e2afa05aabe1154f83e47
Distinguish between special forms and subrs, #'describe-function-1.
lisp/ChangeLog addition:
2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (describe-function-1):
Distinguish between special forms and subrs; don't bind
autoload-file, #'symbol-file returns it like any other function
file name.
diff -r 2986723ac32d -r a1a8728fec10 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Feb 02 23:31:09 2009 +0900
+++ b/lisp/ChangeLog Wed Feb 04 11:38:25 2009 +0000
@@ -1,3 +1,10 @@
+2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * help.el (describe-function-1):
+ Distinguish between special forms and subrs; don't bind
+ autoload-file, #'symbol-file returns it like any other function
+ file name.
+
2009-01-31 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/mule-cmds.el (finish-set-language-environment):
diff -r 2986723ac32d -r a1a8728fec10 lisp/help.el
--- a/lisp/help.el Mon Feb 02 23:31:09 2009 +0900
+++ b/lisp/help.el Wed Feb 04 11:38:25 2009 +0000
@@ -1371,7 +1371,7 @@
(princ function)
(princ "' is ")
(let* ((def function)
- aliases file-name autoload-file kbd-macro-p fndef macrop)
+ aliases file-name kbd-macro-p fndef macrop)
(while (and (symbolp def) (fboundp def))
(when (not (eq def function))
(setq aliases
@@ -1403,11 +1403,17 @@
(an-p "an ")
(t "a "))
"%s"
- (if macro-p " macro" " function")))
+ (cond
+ ((eq 'neither macro-p)
+ "")
+ (macrop " macro")
+ (t " function"))))
string)))))
(cond ((or (stringp def) (vectorp def))
(princ "a keyboard macro.")
(setq kbd-macro-p t))
+ ((special-form-p fndef)
+ (funcall int "built-in special form" nil 'neither))
((subrp fndef)
(funcall int "built-in" nil macrop))
((compiled-function-p fndef)
@@ -1417,7 +1423,6 @@
((eq (car-safe fndef) 'mocklisp)
(funcall int "mocklisp" nil macrop))
((eq (car-safe def) 'autoload)
- (setq autoload-file (elt def 1))
(funcall int "autoloaded Lisp" t (elt def 4)))
((and (symbolp def) (not (fboundp def)))
(princ "a symbol with a void (unbound) function definition."))
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Distinguish between special forms and subrs, #'describe-function-1.
16 years, 1 month
Aidan Kehoe
changeset: 4595:a1a8728fec10bb035ad37b3a21b248dee9d11ef6
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Wed Feb 04 11:38:25 2009 +0000
files: lisp/ChangeLog lisp/help.el
description:
Distinguish between special forms and subrs, #'describe-function-1.
lisp/ChangeLog addition:
2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (describe-function-1):
Distinguish between special forms and subrs; don't bind
autoload-file, #'symbol-file returns it like any other function
file name.
diff -r 2986723ac32dc7f0328e2afa05aabe1154f83e47 -r a1a8728fec10bb035ad37b3a21b248dee9d11ef6 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Feb 02 23:31:09 2009 +0900
+++ b/lisp/ChangeLog Wed Feb 04 11:38:25 2009 +0000
@@ -1,3 +1,10 @@ 2009-01-31 Aidan Kehoe <kehoea@parhasa
+2009-02-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * help.el (describe-function-1):
+ Distinguish between special forms and subrs; don't bind
+ autoload-file, #'symbol-file returns it like any other function
+ file name.
+
2009-01-31 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/mule-cmds.el (finish-set-language-environment):
diff -r 2986723ac32dc7f0328e2afa05aabe1154f83e47 -r a1a8728fec10bb035ad37b3a21b248dee9d11ef6 lisp/help.el
--- a/lisp/help.el Mon Feb 02 23:31:09 2009 +0900
+++ b/lisp/help.el Wed Feb 04 11:38:25 2009 +0000
@@ -1371,7 +1371,7 @@ part of the documentation of internal su
(princ function)
(princ "' is ")
(let* ((def function)
- aliases file-name autoload-file kbd-macro-p fndef macrop)
+ aliases file-name kbd-macro-p fndef macrop)
(while (and (symbolp def) (fboundp def))
(when (not (eq def function))
(setq aliases
@@ -1403,11 +1403,17 @@ part of the documentation of internal su
(an-p "an ")
(t "a "))
"%s"
- (if macro-p " macro" " function")))
+ (cond
+ ((eq 'neither macro-p)
+ "")
+ (macrop " macro")
+ (t " function"))))
string)))))
(cond ((or (stringp def) (vectorp def))
(princ "a keyboard macro.")
(setq kbd-macro-p t))
+ ((special-form-p fndef)
+ (funcall int "built-in special form" nil 'neither))
((subrp fndef)
(funcall int "built-in" nil macrop))
((compiled-function-p fndef)
@@ -1417,7 +1423,6 @@ part of the documentation of internal su
((eq (car-safe fndef) 'mocklisp)
(funcall int "mocklisp" nil macrop))
((eq (car-safe def) 'autoload)
- (setq autoload-file (elt def 1))
(funcall int "autoloaded Lisp" t (elt def 4)))
((and (symbolp def) (not (fboundp def)))
(princ "a symbol with a void (unbound) function definition."))
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Update comment.
16 years, 1 month
Stephen Turnbull
changeset: 4594:2986723ac32dc7f0328e2afa05aabe1154f83e47
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Mon Feb 02 23:31:09 2009 +0900
files: src/ChangeLog src/frame-x.c
description:
Update comment.
diff -r 3623446b34bcc8b4f95e6c11badc75054e0225e5 -r 2986723ac32dc7f0328e2afa05aabe1154f83e47 src/ChangeLog
--- a/src/ChangeLog Mon Feb 02 23:03:31 2009 +0900
+++ b/src/ChangeLog Mon Feb 02 23:31:09 2009 +0900
@@ -1,3 +1,7 @@ 2009-02-02 Stephen J. Turnbull <stephe
+2009-02-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * frame-x.c (x_init_frame_2): Update comment per new info from HT.
+
2009-02-02 Stephen J. Turnbull <stephen(a)xemacs.org>
* frame-x.c (x_init_frame_2): Placate openbox by calling
diff -r 3623446b34bcc8b4f95e6c11badc75054e0225e5 -r 2986723ac32dc7f0328e2afa05aabe1154f83e47 src/frame-x.c
--- a/src/frame-x.c Mon Feb 02 23:03:31 2009 +0900
+++ b/src/frame-x.c Mon Feb 02 23:31:09 2009 +0900
@@ -2165,7 +2165,8 @@ x_init_frame_2 (struct frame *f, Lisp_Ob
* lose the icon (openbox). See <f5bhc3efb17(a)hildegard.inf.ed.ac.uk>.
* SJT:
* This probably means that the frame-icon library won't work with
- * that WM.
+ * that WM. Late breaking news: it *does* work, so possibly the
+ * problem at initialization is due to a race condition.
*/
update_frame_icon (f);
}
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Set icon resource on frame early enough for openbox to find it.
16 years, 1 month
Stephen Turnbull
changeset: 4593:3623446b34bcc8b4f95e6c11badc75054e0225e5
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Mon Feb 02 23:03:31 2009 +0900
files: src/ChangeLog src/frame-x.c
description:
Set icon resource on frame early enough for openbox to find it.
diff -r c6d4ffc018a641939bd983c1abbf7f9fc7de96ab -r 3623446b34bcc8b4f95e6c11badc75054e0225e5 src/ChangeLog
--- a/src/ChangeLog Sat Jan 31 17:43:20 2009 +0000
+++ b/src/ChangeLog Mon Feb 02 23:03:31 2009 +0900
@@ -1,3 +1,9 @@ 2009-01-31 Aidan Kehoe <kehoea@parhasa
+2009-02-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * frame-x.c (x_init_frame_2): Placate openbox by calling
+ update_frame_icon. Suggested by Henry S. Thompson
+ <ht(a)inf.ed.ac.uk> in <f5btz7ghm5k(a)hildegard.inf.ed.ac.uk>.
+
2009-01-31 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.c (unicode_convert):
diff -r c6d4ffc018a641939bd983c1abbf7f9fc7de96ab -r 3623446b34bcc8b4f95e6c11badc75054e0225e5 src/frame-x.c
--- a/src/frame-x.c Sat Jan 31 17:43:20 2009 +0000
+++ b/src/frame-x.c Mon Feb 02 23:03:31 2009 +0900
@@ -2160,6 +2160,14 @@ x_init_frame_2 (struct frame *f, Lisp_Ob
* We'll just need to be careful in the modeline specs.
*/
update_frame_title (f);
+ /* Henry S. Thompson:
+ * Must set icon resource before mapping frame, or some WMs may
+ * lose the icon (openbox). See <f5bhc3efb17(a)hildegard.inf.ed.ac.uk>.
+ * SJT:
+ * This probably means that the frame-icon library won't work with
+ * that WM.
+ */
+ update_frame_icon (f);
}
static void
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5] Suggested patch to frame-x.c -- make sure icon is there
16 years, 1 month
Stephen J. Turnbull
APPROVE COMMIT 21.5
Vin,
Do you want this one for 21.4?
Henry S. Thompson writes:
> Under X, At least one window manager, namely openbox, doesn't see the
> basic frame icons because they are not there when a frame window is
> first opened. The openbox mantainers claim this is an XEmacs bug, not
> their problem.
>
> The attached patch fixes this, but I am not a sufficient (xemacs/)X
> wisard to be confident it is otherwise harmless -- make of it what you
> will.
I've taken the liberty of greatly extending the comment, and prepared the
attached patch.
diff -r c6d4ffc018a6 src/ChangeLog
--- a/src/ChangeLog Sat Jan 31 17:43:20 2009 +0000
+++ b/src/ChangeLog Mon Feb 02 22:53:07 2009 +0900
@@ -1,3 +1,9 @@
+2009-02-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * frame-x.c (x_init_frame_2): Placate openbox by calling
+ update_frame_icon. Suggested by Henry S. Thompson
+ <ht(a)inf.ed.ac.uk> in <f5btz7ghm5k(a)hildegard.inf.ed.ac.uk>.
+
2009-01-31 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.c (unicode_convert):
diff -r c6d4ffc018a6 src/frame-x.c
--- a/src/frame-x.c Sat Jan 31 17:43:20 2009 +0000
+++ b/src/frame-x.c Mon Feb 02 22:53:07 2009 +0900
@@ -2160,6 +2160,14 @@
* We'll just need to be careful in the modeline specs.
*/
update_frame_title (f);
+ /* Henry S. Thompson:
+ * Must set icon resource before mapping frame, or some WMs may
+ * lose the icon (openbox). See <f5bhc3efb17(a)hildegard.inf.ed.ac.uk>.
+ * SJT:
+ * This probably means that the frame-icon library won't work with
+ * that WM.
+ */
+ update_frame_icon (f);
}
static void
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[R21.4] ChangeLog patched, source file patch dropped?!
16 years, 1 month
Stephen J. Turnbull
RECOMMEND 21.4
This patch fixed a minor bug in regexp handling found and diagnosed by
Julian Bradfield. As far as I can tell, although the ChangeLog was
applied to 21.4.22, the patch itself was not.
2008-11-01 Stephen J. Turnbull <stephen(a)xemacs.org>
* regex.c (re_search_2): Fix at_dot by changing charpos to bytepos.
From Julian Bradfield <18654.1143.304851.782755(a)krk.inf.ed.ac.uk>.
Index: src/regex.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.25.2.14
diff -u -r1.25.2.14 regex.c
--- src/regex.c 31 Mar 2006 01:29:00 -0000 1.25.2.14
+++ src/regex.c 31 Jan 2009 12:47:06 -0000
@@ -4075,7 +4075,7 @@
don't keep searching past point. */
if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == at_dot && range > 0)
{
- range = BUF_PT (regex_emacs_buffer) - BUF_BEGV (regex_emacs_buffer)
+ range = BI_BUF_PT (regex_emacs_buffer) - BI_BUF_BEGV (regex_emacs_buffer)
- startpos;
if (range < 0)
return -1;
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] eshell-mode, error while exiting XEmacs, non-defined variable 'eshell-save-history-on-exit
16 years, 1 month
FKtPp
Hi all,
I noticed the latest eshell mode will caused a error when exiting
XEmacs (in case there's live eshell buffer). It was cause by a never
defined variable 'eshell-save-history-on-exit.
Following is the ChangeLog and fix I composed for the issue~~
Could you please help review and commit it to package repository?
Thanks,
FKtPp
ChangeLog addition:
2009-01-25 It's me FKtPp ;) <m_pupil(a)yahoo.com.cn>
* em-hist.el (eshell-save-history-on-exit): NEW. default to nil
* em-hist.el (eshell-hist-initialize): make
'eshell-save-history-on-exit buffer locale by default.
* em-hist.el (eshell-save-some-history): simplify the evaluation logic.
eshell[Packages] source patch:
Diff command: cvs -q diff -u
Files affected: em-hist.el
===================================================================
RCS
Index: em-hist.el
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/eshell/em-hist.el,v
retrieving revision 1.2
diff -u -r1.2 em-hist.el
--- em-hist.el 2008/08/27 21:26:31 1.2
+++ em-hist.el 2009/01/25 11:34:54
@@ -187,6 +187,7 @@
(defvar eshell-history-index nil)
(defvar eshell-matching-input-from-input-string "")
(defvar eshell-save-history-index nil)
+(defvar eshell-save-history-on-exit nil)
(defvar eshell-isearch-map nil)
@@ -270,9 +271,10 @@
(make-local-variable 'eshell-history-index)
(make-local-variable 'eshell-save-history-index)
+ (make-local-variable 'eshell-save-history-on-exit)
(if (minibuffer-window-active-p (selected-window))
- (set (make-local-variable 'eshell-save-history-on-exit) nil)
+ (setq eshell-save-history-on-exit nil)
(set (make-local-variable 'eshell-history-ring) nil)
(if eshell-history-file-name
(eshell-read-history nil t))
@@ -299,8 +301,7 @@
(with-current-buffer buf
(if (and eshell-mode
eshell-history-file-name
- eshell-save-history-on-exit
- (or (eq eshell-save-history-on-exit t)
+ (or eshell-save-history-on-exit
(y-or-n-p
(format "Save input history for Eshell buffer `%s'? "
(buffer-name buf)))))
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] website - removing reference to 21.5 access via CVS
16 years, 1 month
Vin Shelton
I don't know whether the CVS sources for 21.5 are still being
maintained, but it seems to me we should not be advertising them in
any case.
Comments?
- Vin
Index: Develop/cvsaccess.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/cvsaccess.content,v
retrieving revision 1.31
diff -a -u -r1.31 cvsaccess.content
--- Develop/cvsaccess.content 2008/02/02 07:27:20 1.31
+++ Develop/cvsaccess.content 2009/02/01 03:32:44
@@ -69,10 +69,10 @@
(Logging in to cvs(a)sunsite.dk)
CVS password: <strong>cvs</strong>
</pre>
- To get the latest (21.5) development sources, do:
- <pre xml:space="preserve">
- <strong>cvs -z3 -d :pserver:cvs@cvs.xemacs.org:/pack/xemacscvs \
- checkout -d xemacs-21.5 xemacs</strong>
+ <pre>
+The latest (21.5) development sources are no longer available under CVS.
+Please see the introduction to the <a href="hgaccess.html">XEmacs
Mercurial Repository</a>
+for instructions on getting the 21.5 sources.
</pre>
To get the stable (21.4) development sources, do:
<pre xml:space="preserve">
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches