[COMMIT] Advise against #'marker-position in its docstring; follow this advice, lisp/
5 years
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1538350975 -3600
# Mon Oct 01 00:42:55 2018 +0100
# Node ID 9a9e9993b4125f9223cf1189c5cd4791075ea1e3
# Parent 45b565af61281f58888966bc576f3d0f5c0a50b0
Advise against #'marker-position in its docstring; follow this advice, lisp/
src/ChangeLog addition:
2018-10-01 Aidan Kehoe <kehoea(a)parhasard.net>
* marker.c (Fmarker_position):
Advise not to use this function in its docstring; give an example
of a restricted use case where it is reasonable.
lisp/ChangeLog addition:
2018-10-01 Aidan Kehoe <kehoea(a)parhasard.net>
* code-files.el (insert-file-contents):
* cus-edit.el (custom-redraw):
* font-lock.el (font-lock-fontify-syntactically-region):
* help.el (Help-princ-face):
* help.el (Help-prin1-face):
* help.el (help-symbol-regexp):
* indent.el (increase-left-margin):
* indent.el (decrease-left-margin):
* info.el (Info-find-file-node):
* info.el (Info-cease-edit):
* mouse.el (default-mouse-track-deal-with-down-event):
* select.el (select-convert-to-lineno):
* select.el (select-convert-to-sourceloc):
* simple.el (kill-region):
* simple.el (pop-global-mark):
* simple.el (signal-error-on-buffer-boundary):
* wid-edit.el (widget-setup):
* window-xemacs.el (restore-saved-window-parameters):
Don't call #'marker-position in the core Lisp code, as we have
just advised in its docstring.
man/ChangeLog addition:
2018-10-01 Aidan Kehoe <kehoea(a)parhasard.net>
* lispref/compile.texi (Different Behavior):
Mention the unfortunate algorithmic complexity of
#'marker-position when cautioning about the behaviour of (+ MARKER
0).
diff -r 45b565af6128 -r 9a9e9993b412 lisp/ChangeLog
--- a/lisp/ChangeLog Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/ChangeLog Mon Oct 01 00:42:55 2018 +0100
＠＠ -1,3 +1,26 ＠＠
+2018-10-01 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * code-files.el (insert-file-contents):
+ * cus-edit.el (custom-redraw):
+ * font-lock.el (font-lock-fontify-syntactically-region):
+ * help.el (Help-princ-face):
+ * help.el (Help-prin1-face):
+ * help.el (help-symbol-regexp):
+ * indent.el (increase-left-margin):
+ * indent.el (decrease-left-margin):
+ * info.el (Info-find-file-node):
+ * info.el (Info-cease-edit):
+ * mouse.el (default-mouse-track-deal-with-down-event):
+ * select.el (select-convert-to-lineno):
+ * select.el (select-convert-to-sourceloc):
+ * simple.el (kill-region):
+ * simple.el (pop-global-mark):
+ * simple.el (signal-error-on-buffer-boundary):
+ * wid-edit.el (widget-setup):
+ * window-xemacs.el (restore-saved-window-parameters):
+ Don't call #'marker-position in the core Lisp code, as we have
+ just advised in its docstring.
+
2018-09-28 Aidan Kehoe <kehoea(a)parhasard.net>
* byte-optimize.el (byte-optimize-car):
diff -r 45b565af6128 -r 9a9e9993b412 lisp/code-files.el
--- a/lisp/code-files.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/code-files.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -536,12 +536,12 ＠＠
;; convention of post-read-conversion. We try to
;; support the old way. #### Should we kill this?
(funcall func (point) (marker-position endmark))
- (funcall func (- (marker-position endmark) (point))))))
+ (funcall func (- endmark (point))))))
(if visit
(progn
(set-buffer-auto-saved)
(set-buffer-modified-p nil)))))
- (setcar (cdr return-val) (- (marker-position endmark) (point))))
+ (setcar (cdr return-val) (- endmark (point))))
;; now finally set the buffer's `buffer-file-coding-system' ...
(if (run-hook-with-args-until-success 'insert-file-contents-post-hook
filename visit return-val)
diff -r 45b565af6128 -r 9a9e9993b412 lisp/cus-edit.el
--- a/lisp/cus-edit.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/cus-edit.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -1646,8 +1646,10 ＠＠
(let ((line (count-lines (point-min) (point)))
(column (current-column))
(pos (point))
- (from (marker-position (widget-get widget :from)))
- (to (marker-position (widget-get widget :to))))
+ (from (widget-get widget :from))
+ (to (widget-get widget :to)))
+ (check-type from marker)
+ (check-type to marker)
(save-excursion
(widget-value-set widget (widget-value widget))
(custom-redraw-magic widget))
diff -r 45b565af6128 -r 9a9e9993b412 lisp/font-lock.el
--- a/lisp/font-lock.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/font-lock.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -1640,18 +1640,18 ＠＠
(goto-char start)
(let ((lisp-like (font-lock-lisp-like major-mode))
- (cache (marker-position font-lock-cache-position))
+ (cache font-lock-cache-position)
state string beg depth)
;;
;; Find the state at the `beginning-of-line' before `start'.
- (if (eq start cache)
+ (if (= start cache)
;; Use the cache for the state of `start'.
(setq state font-lock-cache-state)
;; Find the state of `start'.
(if (null font-lock-beginning-of-syntax-function)
;; Use the state at the previous cache position, if any, or
;; otherwise calculate from `point-min'.
- (if (or (null cache) (< start cache))
+ (if (or (null (marker-buffer cache)) (< start cache))
(setq state (parse-partial-sexp (point-min) start))
(setq state (parse-partial-sexp cache start nil nil
font-lock-cache-state)))
diff -r 45b565af6128 -r 9a9e9993b412 lisp/help.el
--- a/lisp/help.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/help.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -1314,11 +1314,10 ＠＠
(put-nonduplicable-text-property opoint (point standard-output)
'face face standard-output)))
((markerp standard-output)
- (let ((buf (marker-buffer standard-output))
- (pos (marker-position standard-output)))
+ (let ((pos (copy-marker standard-output)))
(princ object)
(put-nonduplicable-text-property
- pos (marker-position standard-output) 'face face buf)))
+ pos standard-output 'face face (marker-buffer standard-output))))
(t (princ object))))
;; replacement for `prin1' that puts the text in the specified face,
＠＠ -1330,11 +1329,10 ＠＠
(put-nonduplicable-text-property opoint (point standard-output)
'face face standard-output)))
((markerp standard-output)
- (let ((buf (marker-buffer standard-output))
- (pos (marker-position standard-output)))
+ (let ((pos (copy-marker standard-output)))
(prin1 object)
(put-nonduplicable-text-property
- pos (marker-position standard-output) 'face face buf)))
+ pos standard-output 'face face (marker-buffer standard-output))))
(t (prin1 object))))
(defvar help-symbol-regexp
diff -r 45b565af6128 -r 9a9e9993b412 lisp/indent.el
--- a/lisp/indent.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/indent.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -213,12 +213,12 ＠＠
(if (bolp) (setq from (point)))
(goto-char to)
(setq to (point-marker)))
- (alter-text-property from (marker-position to) 'left-margin ; XEmacs
+ (alter-text-property from to 'left-margin ; XEmacs
(lambda (v) (max (- left-margin) (+ inc (or v 0)))))
- (indent-rigidly from (marker-position to) inc) ; XEmacs
+ (indent-rigidly from to inc) ; XEmacs
(if auto-fill-function
(save-excursion
- (fill-region from (marker-position to) nil t t))) ; XEmacs
+ (fill-region from to nil t t))) ; XEmacs
(move-marker to nil))
(defun decrease-left-margin (from to inc)
diff -r 45b565af6128 -r 9a9e9993b412 lisp/info.el
--- a/lisp/info.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/info.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -781,7 +781,7 ＠＠
;; First get advice from tag table if file has one.
;; Also, if this is an indirect info file,
;; read the proper subfile into this buffer.
- (if (marker-position Info-tag-table-marker)
+ (if (marker-buffer Info-tag-table-marker)
(let (foun found-mode (m Info-tag-table-marker))
(save-excursion
(set-buffer (marker-buffer Info-tag-table-marker))
＠＠ -3119,7 +3119,7 ＠＠
(setq buffer-read-only t)
;; Make mode line update.
(set-buffer-modified-p (buffer-modified-p))
- (and (marker-position Info-tag-table-marker)
+ (and (marker-buffer Info-tag-table-marker)
(buffer-modified-p)
(message "Tags may have changed. Use Info-tagify if necessary")))
diff -r 45b565af6128 -r 9a9e9993b412 lisp/mouse.el
--- a/lisp/mouse.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/mouse.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -1205,7 +1205,7 ＠＠
(markerp default-mouse-track-previous-point)
(eq (current-buffer)
(marker-buffer default-mouse-track-previous-point)))
- (marker-position default-mouse-track-previous-point)
+ (copy-marker default-mouse-track-previous-point)
(point)))
(default-mouse-track-set-point event default-mouse-track-window)
(if (not adjust)
diff -r 45b565af6128 -r 9a9e9993b412 lisp/select.el
--- a/lisp/select.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/select.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -597,8 +597,8 ＠＠
((and (consp value)
(markerp (car value))
(markerp (cdr value)))
- (setq a (marker-position (car value))
- b (marker-position (cdr value))
+ (setq a (car value)
+ b (cdr value)
buf (marker-buffer (car value)))))
(save-excursion
(set-buffer buf)
＠＠ -649,8 +649,8 ＠＠
((and (consp value)
(markerp (car value))
(markerp (cdr value)))
- (setq a (marker-position (car value))
- b (marker-position (cdr value))
+ (setq a (car value)
+ b (cdr value)
buf (or (marker-buffer (car value))
(error "selection is in a killed buffer"))
file-name (buffer-file-name buf))))
diff -r 45b565af6128 -r 9a9e9993b412 lisp/simple.el
--- a/lisp/simple.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/simple.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -1465,8 +1465,6 ＠＠
; (if region-hack (zmacs-deactivate-region)))))
;; start and end can be markers but the rest of this function is
;; written as if they are only integers
- (if (markerp start) (setq start (marker-position start)))
- (if (markerp end) (setq end (marker-position end)))
(or (and start end) (if zmacs-regions ;; rewritten for I18N3 snarfing
(error "The region is not active now")
(error "The mark is not set now")))
＠＠ -2018,15 +2016,14 ＠＠
(or global-mark-ring
(error "No global mark set"))
(let* ((marker (car global-mark-ring))
- (buffer (marker-buffer marker))
- (position (marker-position marker)))
+ (buffer (marker-buffer marker)))
(setq global-mark-ring (nconc (cdr global-mark-ring)
(list (car global-mark-ring))))
(set-buffer buffer)
- (or (and (>= position (point-min))
- (<= position (point-max)))
+ (or (and (>= marker (point-min))
+ (<= marker (point-max)))
(widen))
- (goto-char position)
+ (goto-char marker)
(switch-to-buffer buffer)))
diff -r 45b565af6128 -r 9a9e9993b412 lisp/wid-edit.el
--- a/lisp/wid-edit.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/wid-edit.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -1553,8 +1553,7 ＠＠
widget-field-list (cons field widget-field-list))
(let ((from (car (widget-get field :field-extent)))
(to (cdr (widget-get field :field-extent))))
- (widget-specify-field field
- (marker-position from) (marker-position to))
+ (widget-specify-field field from to)
(set-marker from nil)
(set-marker to nil))
;; If the field is placed within the inactive zone, deactivate it.
diff -r 45b565af6128 -r 9a9e9993b412 lisp/window-xemacs.el
--- a/lisp/window-xemacs.el Fri Sep 28 11:00:54 2018 +0100
+++ b/lisp/window-xemacs.el Mon Oct 01 00:42:55 2018 +0100
＠＠ -522,13 +522,13 ＠＠
(set-window-buffer window
(saved-window-buffer saved-window))
(set-window-start window
- (marker-position (saved-window-start-marker saved-window))
+ (saved-window-start-marker saved-window)
t)
(if (markerp (saved-window-point-marker saved-window))
(set-window-point window
- (marker-position (saved-window-point-marker saved-window))))
+ (saved-window-point-marker saved-window)))
(set-marker (mark-marker t buffer)
- (marker-position (saved-window-mark-marker saved-window))
+ (saved-window-mark-marker saved-window)
buffer)
(if (not (eq buffer (window-configuration-current-buffer configuration)))
(goto-char (window-point window) buffer)))))
diff -r 45b565af6128 -r 9a9e9993b412 man/ChangeLog
--- a/man/ChangeLog Fri Sep 28 11:00:54 2018 +0100
+++ b/man/ChangeLog Mon Oct 01 00:42:55 2018 +0100
＠＠ -1,3 +1,10 ＠＠
+2018-10-01 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * lispref/compile.texi (Different Behavior):
+ Mention the unfortunate algorithmic complexity of
+ #'marker-position when cautioning about the behaviour of (+ MARKER
+ 0).
+
2018-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* cl.texi (Time of Evaluation): Use the new-style
diff -r 45b565af6128 -r 9a9e9993b412 man/lispref/compile.texi
--- a/man/lispref/compile.texi Fri Sep 28 11:00:54 2018 +0100
+++ b/man/lispref/compile.texi Mon Oct 01 00:42:55 2018 +0100
＠＠ -1097,8 +1097,11 ＠＠
If you're trying to use ＠samp{(+ ＠var{object} 0)} to convert
＠var{object} to integer, consider using an explicit conversion function,
which is clearer and guaranteed to work.
-Instead of ＠samp{(+ ＠var{marker} 0)}, use ＠samp{(marker-position ＠var{marker})}.
Instead of ＠samp{(+ ＠var{char} 0)}, use ＠samp{(char-int ＠var{char})}.
+Instead of ＠samp{(+ ＠var{marker} 0)}, you can write
+＠samp{(marker-position ＠var{marker})}, but this has its own efficiency
+problems. You many not need to convert from a marker at all, since most
+of the primitives convert automatically; test your code!
＠end itemize
For maximal equivalence between interpreted and compiled code, the
diff -r 45b565af6128 -r 9a9e9993b412 src/ChangeLog
--- a/src/ChangeLog Fri Sep 28 11:00:54 2018 +0100
+++ b/src/ChangeLog Mon Oct 01 00:42:55 2018 +0100
＠＠ -1,3 +1,9 ＠＠
+2018-10-01 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * marker.c (Fmarker_position):
+ Advise not to use this function in its docstring; give an example
+ of a restricted use case where it is reasonable.
+
2018-09-17 Aidan Kehoe <kehoea(a)parhasard.net>
* buffer.c (Fline_number):
diff -r 45b565af6128 -r 9a9e9993b412 src/marker.c
--- a/src/marker.c Fri Sep 28 11:00:54 2018 +0100
+++ b/src/marker.c Mon Oct 01 00:42:55 2018 +0100
＠＠ -136,8 +136,22 ＠＠
}
DEFUN ("marker-position", Fmarker_position, 1, 1, 0, /*
-Return the position MARKER points at, as a character number.
+Return the buffer position to which MARKER points, as a fixnum.
+
Return `nil' if marker doesn't point anywhere.
+
+Usually there is no need to call this function; if you are using
+marker positions in arithmetic or comparing them, markers are
+converted automatically as needed. Markers are stored internally as
+byte, not character positions, so in the worst case scenario
+`marker-position' is O(N) on the (possibly large) position in the
+buffer, and much of the time the C code can avoid this entirely given
+its knowledge of the relationship between byte and character
+positions.
+
+One of the few use cases for this function is when saving a buffer
+offset to an external file, when the integer value does need to be
+generated.
*/
(marker))
{
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Remove needless byte-char conversion in redisplay, line-number.c
5 years
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1537221545 -3600
# Mon Sep 17 22:59:05 2018 +0100
# Node ID 0f7b7204a7ff9acfa1ad4205b3d14c7ffff80375
# Parent 073c3792b109212ab00875dba328668d20436e40
Remove needless byte-char conversion in redisplay, line-number.c
src/ChangeLog addition:
2018-09-17 Aidan Kehoe <kehoea(a)parhasard.net>
* buffer.c (Fline_number):
Adjust the call to buffer_line_number() here to use the Bytebpos.
* insdel.c (buffer_insert_string_1):
Adjust the call to insert_invalidate_line_number_cache() to use
the Bytebpos.
* insdel.c (buffer_delete_range):
Adjust the call to delete_invalidate_line_number_cache() to use
the Bytebpos.
* line-number.c (narrow_line_number_cache):
Check the byte positions rather than the character positions here,
for consistency.
* line-number.c (invalidate_line_number_cache):
Now POS is a bytebpos, use byte_marker_position(), rather than
marker_position(), so that inserting a newline is no longer O(S),
where S is the number of entries in the line number cache.
* line-number.c (insert_invalidate_line_number_cache):
Take FROM and TO as byte rather than character positions.
* line-number.c (delete_invalidate_line_number_cache):
Ditto.
* line-number.c (get_nearest_line_number):
Take BEG and POS as byte rather than character positions.
* line-number.c (add_position_to_cache):
Take POS as a byte position, which allows us to call
set_byte_marker_position() on our Fmake_marker() argument, an O(1)
operation.
* line-number.c (buffer_line_number):
Take POS as a byte position here.
* line-number.h:
* line-number.h (buffer_line_number):
* line-number.h (insert_invalidate_line_number_cache):
* line-number.h (delete_invalidate_line_number_cache):
Update the declaration for these functions to reflect Bytebpos
rather than Charbpos arguments.
* lisp.h:
Make byte_scan_buffer() available here.
* redisplay.c (window_line_number):
Adjust this so we're not doing marker_position() on the saved
point marker, potentially O(N) on the position in the buffer.
* search.c (byte_scan_buffer):
Make this non-static (ideally we would delete scan_buffer()
entirely).
diff -r 073c3792b109 -r 0f7b7204a7ff src/ChangeLog
--- a/src/ChangeLog Mon Sep 17 20:50:35 2018 +0100
+++ b/src/ChangeLog Mon Sep 17 22:59:05 2018 +0100
＠＠ -1,3 +1,47 ＠＠
+2018-09-17 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * buffer.c (Fline_number):
+ Adjust the call to buffer_line_number() here to use the Bytebpos.
+ * insdel.c (buffer_insert_string_1):
+ Adjust the call to insert_invalidate_line_number_cache() to use
+ the Bytebpos.
+ * insdel.c (buffer_delete_range):
+ Adjust the call to delete_invalidate_line_number_cache() to use
+ the Bytebpos.
+ * line-number.c (narrow_line_number_cache):
+ Check the byte positions rather than the character positions here,
+ for consistency.
+ * line-number.c (invalidate_line_number_cache):
+ Now POS is a bytebpos, use byte_marker_position(), rather than
+ marker_position(), so that inserting a newline is no longer O(S),
+ where S is the number of entries in the line number cache.
+ * line-number.c (insert_invalidate_line_number_cache):
+ Take FROM and TO as byte rather than character positions.
+ * line-number.c (delete_invalidate_line_number_cache):
+ Ditto.
+ * line-number.c (get_nearest_line_number):
+ Take BEG and POS as byte rather than character positions.
+ * line-number.c (add_position_to_cache):
+ Take POS as a byte position, which allows us to call
+ set_byte_marker_position() on our Fmake_marker() argument, an O(1)
+ operation.
+ * line-number.c (buffer_line_number):
+ Take POS as a byte position here.
+ * line-number.h:
+ * line-number.h (buffer_line_number):
+ * line-number.h (insert_invalidate_line_number_cache):
+ * line-number.h (delete_invalidate_line_number_cache):
+ Update the declaration for these functions to reflect Bytebpos
+ rather than Charbpos arguments.
+ * lisp.h:
+ Make byte_scan_buffer() available here.
+ * redisplay.c (window_line_number):
+ Adjust this so we're not doing marker_position() on the saved
+ point marker, potentially O(N) on the position in the buffer.
+ * search.c (byte_scan_buffer):
+ Make this non-static (ideally we would delete scan_buffer()
+ entirely).
+
2018-09-17 Aidan Kehoe <kehoea(a)parhasard.net>
* editfns.c (byte_beginning_of_line_p): New. Byte-oriented
diff -r 073c3792b109 -r 0f7b7204a7ff src/buffer.c
--- a/src/buffer.c Mon Sep 17 20:50:35 2018 +0100
+++ b/src/buffer.c Mon Sep 17 22:59:05 2018 +0100
＠＠ -1825,8 +1825,8 ＠＠
(position, respect_narrowing, buffer_))
{
struct buffer *buf = decode_buffer (buffer_, 0);
- Charbpos pos = (NILP (position) ? BUF_PT (buf) :
- get_buffer_pos_char (buf, position, GB_COERCE_RANGE));
+ Bytebpos pos = (NILP (position) ? BYTE_BUF_PT (buf) :
+ get_buffer_pos_byte (buf, position, GB_COERCE_RANGE));
return make_fixnum (buffer_line_number (buf, pos, 1,
!NILP (respect_narrowing)) + 1);
diff -r 073c3792b109 -r 0f7b7204a7ff src/insdel.c
--- a/src/insdel.c Mon Sep 17 20:50:35 2018 +0100
+++ b/src/insdel.c Mon Sep 17 22:59:05 2018 +0100
＠＠ -1160,7 +1160,8 ＠＠
in a consistent state. Following code puts buffer in an inconsistent
state and can be considered a "critical section". */
- insert_invalidate_line_number_cache (buf, pos, nonreloc + offset, length);
+ insert_invalidate_line_number_cache (buf, bytepos, nonreloc + offset,
+ length);
MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons)
{
＠＠ -1445,7 +1446,7 ＠＠
}
}
- delete_invalidate_line_number_cache (buf, from, to);
+ delete_invalidate_line_number_cache (buf, byte_from, byte_to);
#ifdef MULE
/* Update our count of ASCII, 8-bit and 16-bit chars and the
diff -r 073c3792b109 -r 0f7b7204a7ff src/line-number.c
--- a/src/line-number.c Mon Sep 17 20:50:35 2018 +0100
+++ b/src/line-number.c Mon Sep 17 22:59:05 2018 +0100
＠＠ -103,7 +103,7 ＠＠
if (NILP (b->text->line_number_cache))
return;
- if (BUF_BEG (b) == BUF_BEGV (b))
+ if (BYTE_BUF_BEG (b) == BYTE_BUF_BEGV (b))
/* The is the case Fwiden and save_restriction_restore. Since we
know the correct value, we can update it now. */
LINE_NUMBER_BEGV (b) = Qzero;
＠＠ -116,7 +116,7 ＠＠
/* Invalidate the line number cache positions that lie after POS. */
static void
-invalidate_line_number_cache (struct buffer *b, Charbpos pos)
+invalidate_line_number_cache (struct buffer *b, Bytebpos pos)
{
EMACS_INT i, j;
Lisp_Object *ring = XVECTOR_DATA (LINE_NUMBER_RING (b));
＠＠ -134,7 +134,7 ＠＠
at point, which is way losing. Isn't there a way to make a
marker impervious to Finsert_before_markers()?? Maybe I
should convert the code to use extents. */
- if (marker_position (XCAR (ring[i])) >= pos)
+ if (byte_marker_position (XCAR (ring[i])) >= pos)
{
/* Get the marker out of the way. */
Fset_marker (XCAR (ring[i]), Qnil, Qnil);
＠＠ -155,7 +155,7 ＠＠
This will do nothing if the cache is uninitialized. */
void
-insert_invalidate_line_number_cache (struct buffer *b, Charbpos pos,
+insert_invalidate_line_number_cache (struct buffer *b, Bytebpos pos,
const Ibyte *nonreloc, Bytecount length)
{
if (NILP (b->text->line_number_cache))
＠＠ -177,7 +177,8 ＠＠
This will do nothing if the cache is uninitialized. */
void
-delete_invalidate_line_number_cache (struct buffer *b, Charbpos from, Charbpos to)
+delete_invalidate_line_number_cache (struct buffer *b, Bytebpos from,
+ Bytebpos to)
{
if (NILP (b->text->line_number_cache))
return;
＠＠ -187,7 +188,7 ＠＠
else
{
EMACS_INT shortage;
- scan_buffer (b, '\n', from, to, 1, &shortage, 0);
+ byte_scan_buffer (b, '\n', from, to, 1, &shortage, 0);
if (!shortage)
invalidate_line_number_cache (b, from);
}
＠＠ -202,12 +203,12 ＠＠
BEG will be BUF_BEGV, and *LINE will be XFIXNUM (LINE_NUMBER_BEGV).
This will initialize the cache, if necessary. */
static void
-get_nearest_line_number (struct buffer *b, Charbpos *beg, Charbpos pos,
+get_nearest_line_number (struct buffer *b, Bytebpos *beg, Bytebpos pos,
EMACS_INT *line)
{
EMACS_INT i;
Lisp_Object *ring = XVECTOR_DATA (LINE_NUMBER_RING (b));
- Charcount length = pos - *beg;
+ Bytecount length = pos - *beg;
if (length < 0)
length = -length;
＠＠ -215,8 +216,8 ＠＠
/* Find the ring entry closest to POS, if it is closer than BEG. */
for (i = 0; i < LINE_NUMBER_RING_SIZE && CONSP (ring[i]); i++)
{
- Charbpos newpos = marker_position (XCAR (ring[i]));
- Charcount howfar = newpos - pos;
+ Bytebpos newpos = byte_marker_position (XCAR (ring[i]));
+ Bytecount howfar = newpos - pos;
if (howfar < 0)
howfar = -howfar;
if (howfar < length)
＠＠ -230,7 +231,7 ＠＠
/* Add a (POS . LINE) pair to the ring, and rotate it. */
static void
-add_position_to_cache (struct buffer *b, Charbpos pos, EMACS_INT line)
+add_position_to_cache (struct buffer *b, Bytebpos pos, EMACS_INT line)
{
Lisp_Object *ring = XVECTOR_DATA (LINE_NUMBER_RING (b));
int i = LINE_NUMBER_RING_SIZE - 1;
＠＠ -244,8 +245,8 ＠＠
ring[i] = ring[i - 1];
/* ...and update it. */
- ring[0] = Fcons (Fset_marker (Fmake_marker (), make_fixnum (pos),
- wrap_buffer (b)),
+ ring[0] = Fcons (set_byte_marker_position (Fmake_marker (), pos,
+ wrap_buffer (b)),
make_fixnum (line));
}
＠＠ -266,17 +267,17 ＠＠
If the calculation (with or without the cache lookup) required more
than LINE_NUMBER_FAR characters of traversal, update the cache. */
EMACS_INT
-buffer_line_number (struct buffer *b, Charbpos pos, Boolint cachep,
+buffer_line_number (struct buffer *b, Bytebpos pos, Boolint cachep,
Boolint respect_narrowing)
{
- Charbpos beg = respect_narrowing ? BUF_BEGV (b) : BUF_BEG (b);
+ Bytebpos beg = respect_narrowing ? BYTE_BUF_BEGV (b) : BYTE_BUF_BEG (b);
EMACS_INT cached_lines = 0;
EMACS_INT shortage, line;
if ((pos > beg ? pos - beg : beg - pos) <= LINE_NUMBER_FAR)
cachep = 0;
- if (cachep && (respect_narrowing || BUF_BEG (b) == BUF_BEGV (b)))
+ if (cachep && (respect_narrowing || BYTE_BUF_BEG (b) == BYTE_BUF_BEGV (b)))
{
if (NILP (b->text->line_number_cache))
allocate_line_number_cache (b);
＠＠ -286,13 +287,13 ＠＠
LINE_NUMBER_BEGV (b) = Qzero;
/* #### This has a side-effect of changing the cache. */
LINE_NUMBER_BEGV (b) =
- make_fixnum (buffer_line_number (b, BUF_BEGV (b), 1, 0));
+ make_fixnum (buffer_line_number (b, BYTE_BUF_BEGV (b), 1, 0));
}
cached_lines = XFIXNUM (LINE_NUMBER_BEGV (b));
get_nearest_line_number (b, &beg, pos, &cached_lines);
}
- scan_buffer (b, '\n', beg, pos,
+ byte_scan_buffer (b, '\n', beg, pos,
pos > beg ? MOST_POSITIVE_FIXNUM : -MOST_POSITIVE_FIXNUM,
&shortage, 0);
diff -r 073c3792b109 -r 0f7b7204a7ff src/line-number.h
--- a/src/line-number.h Mon Sep 17 20:50:35 2018 +0100
+++ b/src/line-number.h Mon Sep 17 22:59:05 2018 +0100
＠＠ -21,10 +21,10 ＠＠
/* Synched up with: Not in FSF. */
void narrow_line_number_cache (struct buffer *);
-void insert_invalidate_line_number_cache (struct buffer *, Charbpos,
+void insert_invalidate_line_number_cache (struct buffer *, Bytebpos,
const Ibyte *, Bytecount);
-void delete_invalidate_line_number_cache (struct buffer *, Charbpos, Charbpos);
+void delete_invalidate_line_number_cache (struct buffer *, Bytebpos, Bytebpos);
-EMACS_INT buffer_line_number (struct buffer *, Charbpos, int, Boolint);
+EMACS_INT buffer_line_number (struct buffer *, Bytebpos, int, Boolint);
#endif /* INCLUDED_line_number_h_ */
diff -r 073c3792b109 -r 0f7b7204a7ff src/lisp.h
--- a/src/lisp.h Mon Sep 17 20:50:35 2018 +0100
+++ b/src/lisp.h Mon Sep 17 22:59:05 2018 +0100
＠＠ -6009,6 +6009,9 ＠＠
struct re_registers;
Charbpos scan_buffer (struct buffer *, Ichar, Charbpos, Charbpos, EMACS_INT,
EMACS_INT *, int);
+Bytebpos byte_scan_buffer (struct buffer *, Ichar, Bytebpos, Bytebpos ,
+ EMACS_INT, EMACS_INT *, int);
+
Charbpos find_next_newline (struct buffer *, Charbpos, int);
Charbpos find_next_newline_no_quit (struct buffer *, Charbpos, int);
Bytebpos byte_find_next_newline_no_quit (struct buffer *, Bytebpos, int);
diff -r 073c3792b109 -r 0f7b7204a7ff src/redisplay.c
--- a/src/redisplay.c Mon Sep 17 20:50:35 2018 +0100
+++ b/src/redisplay.c Mon Sep 17 22:59:05 2018 +0100
＠＠ -7287,13 +7287,13 ＠＠
/* Be careful in the order of these tests. The first clause will
fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
This can occur when the frame title is computed really early */
- Charbpos pos =
+ Bytebpos pos =
((EQ (DEVICE_SELECTED_FRAME (d), w->frame) &&
(w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d)))) &&
EQ (DEVICE_CONSOLE (d), Vselected_console) &&
XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d )
- ? BUF_PT (b)
- : marker_position (w->pointm[type]));
+ ? BYTE_BUF_PT (b)
+ : byte_marker_position (w->pointm[type]));
EMACS_INT line;
line = buffer_line_number (b, pos, 1, 1);
diff -r 073c3792b109 -r 0f7b7204a7ff src/search.c
--- a/src/search.c Mon Sep 17 20:50:35 2018 +0100
+++ b/src/search.c Mon Sep 17 22:59:05 2018 +0100
＠＠ -702,7 +702,7 ＠＠
If ALLOW_QUIT is non-zero, call QUIT periodically. */
-static Bytebpos
+Bytebpos
byte_scan_buffer (struct buffer *buf, Ichar target, Bytebpos st, Bytebpos en,
EMACS_INT count, EMACS_INT *shortage, int allow_quit)
{
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Correct a couple of small bugs in #'byte-optimize-{cdr,car}; add tests
5 years
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1538128854 -3600
# Fri Sep 28 11:00:54 2018 +0100
# Node ID 45b565af61281f58888966bc576f3d0f5c0a50b0
# Parent 0f7b7204a7ff9acfa1ad4205b3d14c7ffff80375
Correct a couple of small bugs in #'byte-optimize-{cdr,car}; add tests
lisp/ChangeLog addition:
2018-09-28 Aidan Kehoe <kehoea(a)parhasard.net>
* byte-optimize.el (byte-optimize-car):
* byte-optimize.el (byte-optimize-cdr):
Leave erroring on zero arguments and returning nil on nil
arguments to #'byte-optimize-predicate within these functions.
tests/ChangeLog addition:
2018-09-28 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
Supply tests on #'car, #'cdr, helping to flush out (especially)
byte-compiler problems down the line.
diff -r 0f7b7204a7ff -r 45b565af6128 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Sep 17 22:59:05 2018 +0100
+++ b/lisp/ChangeLog Fri Sep 28 11:00:54 2018 +0100
＠＠ -1,3 +1,10 ＠＠
+2018-09-28 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * byte-optimize.el (byte-optimize-car):
+ * byte-optimize.el (byte-optimize-cdr):
+ Leave erroring on zero arguments and returning nil on nil
+ arguments to #'byte-optimize-predicate within these functions.
+
2018-09-16 Aidan Kehoe <kehoea(a)parhasard.net>
* alist.el: Remove this.
diff -r 0f7b7204a7ff -r 45b565af6128 lisp/byte-optimize.el
--- a/lisp/byte-optimize.el Mon Sep 17 22:59:05 2018 +0100
+++ b/lisp/byte-optimize.el Fri Sep 28 11:00:54 2018 +0100
＠＠ -865,8 +865,7 ＠＠
(defun byte-optimize-car (form)
(let ((arg (cadr form)))
(cond
- ((not arg)) ;; Return nil if called on nil
- ((and (byte-compile-constp arg)
+ ((and (byte-compile-constp arg) arg
(not (and (eq (car-safe arg) 'quote) (listp (cadr arg)))))
(byte-compile-warn "taking car of a non-list constant: %s" arg)
form)
＠＠ -881,8 +880,7 ＠＠
(defun byte-optimize-cdr (form)
(let ((arg (cadr form)))
(cond
- ((not arg)) ;; Return nil if called on nil
- ((and (byte-compile-constp arg)
+ ((and (byte-compile-constp arg) arg
(not (and (consp arg) (eq (car arg) 'quote) (listp (cadr arg)))))
(byte-compile-warn "taking cdr of a non-list constant: %s" arg)
form)
diff -r 0f7b7204a7ff -r 45b565af6128 tests/ChangeLog
--- a/tests/ChangeLog Mon Sep 17 22:59:05 2018 +0100
+++ b/tests/ChangeLog Fri Sep 28 11:00:54 2018 +0100
＠＠ -1,3 +1,9 ＠＠
+2018-09-28 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el:
+ Supply tests on #'car, #'cdr, helping to flush out (especially)
+ byte-compiler problems down the line.
+
2018-08-22 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el:
diff -r 0f7b7204a7ff -r 45b565af6128 tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Mon Sep 17 22:59:05 2018 +0100
+++ b/tests/automated/lisp-tests.el Fri Sep 28 11:00:54 2018 +0100
＠＠ -339,6 +339,44 ＠＠
(Assert (eql (safe-length nil) 0))
;;-----------------------------------------------------
+;; Test `car' and `cdr'
+;;-----------------------------------------------------
+
+(Check-Error wrong-number-of-arguments (car))
+(Check-Error wrong-number-of-arguments (car '(1 2) 'foo))
+(Check-Error wrong-type-argument (car '[1 2]))
+(Assert (eq (car '(a . b)) 'a) "checking #'car on a constant dotted pair")
+(Assert (eq (let ((pair '(b . a)))
+ (car pair))
+ 'b) "checking #'car on a bound dotted pair")
+(Assert (eql (car '(200 200 4 0 9)) 200)
+ "checking #'car on a constant list")
+(Assert (eql (let ((list (list 200 200 4 0 9))) (car list))
+ 200) "checking #'car on a bound list")
+(Assert (eql (car (list 200 200 4 0 9)) 200)
+ "checking #'car on a list constructed at runtime")
+
+(Check-Error wrong-number-of-arguments (cdr))
+(Check-Error wrong-number-of-arguments (cdr '(1 2) 'foo))
+(Check-Error wrong-type-argument (cdr '[1 2]))
+(Assert (eq (cdr '(a . b)) 'b) "checking #'cdr on a constant dotted pair")
+(Assert (eq (let ((pair '(b . a)))
+ (cdr pair))
+ 'a) "checking #'cdr on a bound dotted pair")
+(Assert (equal (cdr '(200 200 4 0 9)) (list 200 4 0 9))
+ "checking #'cdr on a constant list")
+(Assert (equal (let ((list (list 200 200 4 0 9))) (cdr list))
+ '(200 4 0 9))
+ "checking #'cdr on a bound list")
+(Assert (equal (cdr (list 200 200 4 0 9))
+ '(200 4 0 9))
+ "checking #'cdr on a list constructed at runtime")
+(Assert (let* ((gensym (gensym))
+ (pair (cons 'a gensym)))
+ (eq (cdr pair) gensym))
+ "checking the result of #'cdr for #'eq-identity")
+
+;;-----------------------------------------------------
;; Arithmetic operations
;;-----------------------------------------------------
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Further reduce calls to charbpos_to_bytebpos(), editfns.c
5 years
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1537213835 -3600
# Mon Sep 17 20:50:35 2018 +0100
# Node ID 073c3792b109212ab00875dba328668d20436e40
# Parent b6e0eddc51b9cced629afa296a5806555b76458f
Further reduce calls to charbpos_to_bytebpos(), editfns.c
src/ChangeLog addition:
2018-09-17 Aidan Kehoe <kehoea(a)parhasard.net>
* editfns.c (byte_beginning_of_line_p): New. Byte-oriented
equivalent of beginning_of_line_p().
* editfns.c (Ffollowing_char):
* editfns.c (Fpreceding_char):
* editfns.c (Fbobp):
* editfns.c (Feobp):
* editfns.c (Fbolp):
* editfns.c (Feolp):
* editfns.c (Fchar_after):
* editfns.c (Fchar_before):
Reduce calls to charbpos_to_bytebpos() in all these functions,
which a) will lead to fewer O(N) operations (often zero O(N)
operations) for a certain (rare) pattern of calls, and b)
eliminates the C function overhead all the time, which is of value
in itself, in these functions with byte codes.
* lisp.h:
Revise the declaration of beginning_of_line_p() to return a
Boolint.
diff -r b6e0eddc51b9 -r 073c3792b109 src/ChangeLog
--- a/src/ChangeLog Sun Sep 16 23:10:14 2018 +0100
+++ b/src/ChangeLog Mon Sep 17 20:50:35 2018 +0100
＠＠ -1,3 +1,24 ＠＠
+2018-09-17 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * editfns.c (byte_beginning_of_line_p): New. Byte-oriented
+ equivalent of beginning_of_line_p().
+ * editfns.c (Ffollowing_char):
+ * editfns.c (Fpreceding_char):
+ * editfns.c (Fbobp):
+ * editfns.c (Feobp):
+ * editfns.c (Fbolp):
+ * editfns.c (Feolp):
+ * editfns.c (Fchar_after):
+ * editfns.c (Fchar_before):
+ Reduce calls to charbpos_to_bytebpos() in all these functions,
+ which a) will lead to fewer O(N) operations (often zero O(N)
+ operations) for a certain (rare) pattern of calls, and b)
+ eliminates the C function overhead all the time, which is of value
+ in itself, in these functions with byte codes.
+ * lisp.h:
+ Revise the declaration of beginning_of_line_p() to return a
+ Boolint.
+
2018-08-26 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecode.c:
diff -r b6e0eddc51b9 -r 073c3792b109 src/editfns.c
--- a/src/editfns.c Sun Sep 16 23:10:14 2018 +0100
+++ b/src/editfns.c Mon Sep 17 20:50:35 2018 +0100
＠＠ -468,10 +468,10 ＠＠
(buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- if (BUF_PT (b) >= BUF_ZV (b))
+ if (BYTE_BUF_PT (b) >= BYTE_BUF_ZV (b))
return Qzero; /* #### Gag me! */
else
- return make_char (BUF_FETCH_CHAR (b, BUF_PT (b)));
+ return make_char (BYTE_BUF_FETCH_CHAR (b, BYTE_BUF_PT (b)));
}
DEFUN ("preceding-char", Fpreceding_char, 0, 1, 0, /*
＠＠ -482,10 +482,15 ＠＠
(buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- if (BUF_PT (b) <= BUF_BEGV (b))
+ if (BYTE_BUF_PT (b) <= BYTE_BUF_BEGV (b))
return Qzero; /* #### Gag me! */
else
- return make_char (BUF_FETCH_CHAR (b, BUF_PT (b) - 1));
+ {
+ Bytebpos bpos = BYTE_BUF_PT (b);
+ DEC_BYTEBPOS (b, bpos);
+
+ return make_char (BYTE_BUF_FETCH_CHAR (b, bpos));
+ }
}
DEFUN ("bobp", Fbobp, 0, 1, 0, /*
＠＠ -496,7 +501,7 ＠＠
(buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- return BUF_PT (b) == BUF_BEGV (b) ? Qt : Qnil;
+ return BYTE_BUF_PT (b) == BYTE_BUF_BEGV (b) ? Qt : Qnil;
}
DEFUN ("eobp", Feobp, 0, 1, 0, /*
＠＠ -507,16 +512,29 ＠＠
(buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- return BUF_PT (b) == BUF_ZV (b) ? Qt : Qnil;
+ return BYTE_BUF_PT (b) == BYTE_BUF_ZV (b) ? Qt : Qnil;
}
-int
+static Boolint
+byte_beginning_of_line_p (struct buffer *b, Bytebpos bpt)
+{
+ if (bpt <= BYTE_BUF_BEGV (b))
+ {
+ return 1;
+ }
+
+ DEC_BYTEBPOS (b, bpt);
+ return BYTE_BUF_FETCH_CHAR (b, bpt) == '\n';
+}
+
+/* #### Rework redisplay.c and the window code to use
+ byte_beginning_of_line_p() instead of this! */
+Boolint
beginning_of_line_p (struct buffer *b, Charbpos pt)
{
return pt <= BUF_BEGV (b) || BUF_FETCH_CHAR (b, pt - 1) == '\n';
}
-
DEFUN ("bolp", Fbolp, 0, 1, 0, /*
Return t if point is at the beginning of a line.
If BUFFER is nil, the current buffer is assumed.
＠＠ -524,7 +542,7 ＠＠
(buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- return beginning_of_line_p (b, BUF_PT (b)) ? Qt : Qnil;
+ return byte_beginning_of_line_p (b, BYTE_BUF_PT (b)) ? Qt : Qnil;
}
DEFUN ("eolp", Feolp, 0, 1, 0, /*
＠＠ -535,7 +553,8 ＠＠
(buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- return (BUF_PT (b) == BUF_ZV (b) || BUF_FETCH_CHAR (b, BUF_PT (b)) == '\n')
+ return (BYTE_BUF_PT (b) == BYTE_BUF_ZV (b) ||
+ BYTE_BUF_FETCH_CHAR (b, BYTE_BUF_PT (b)) == '\n')
? Qt : Qnil;
}
＠＠ -549,12 +568,12 ＠＠
(pos, buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- Charbpos n = (NILP (pos) ? BUF_PT (b) :
- get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD));
+ Bytebpos bn = (NILP (pos) ? BYTE_BUF_PT (b) :
+ get_buffer_pos_byte (b, pos, GB_NO_ERROR_IF_BAD));
- if (n < 0 || n == BUF_ZV (b))
+ if (bn < 0 || bn == BYTE_BUF_ZV (b))
return Qnil;
- return make_char (BUF_FETCH_CHAR (b, n));
+ return make_char (BYTE_BUF_FETCH_CHAR (b, bn));
}
DEFUN ("char-before", Fchar_before, 0, 2, 0, /*
＠＠ -567,14 +586,15 ＠＠
(pos, buffer))
{
struct buffer *b = decode_buffer (buffer, 1);
- Charbpos n = (NILP (pos) ? BUF_PT (b) :
- get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD));
+ Bytebpos bn = (NILP (pos) ? BYTE_BUF_PT (b) :
+ get_buffer_pos_byte (b, pos, GB_NO_ERROR_IF_BAD));
- n--;
+ if (bn <= BYTE_BUF_BEGV (b))
+ return Qnil;
- if (n < BUF_BEGV (b))
- return Qnil;
- return make_char (BUF_FETCH_CHAR (b, n));
+ DEC_BYTEBPOS (b, bn);
+
+ return make_char (BYTE_BUF_FETCH_CHAR (b, bn));
}
diff -r b6e0eddc51b9 -r 073c3792b109 src/lisp.h
--- a/src/lisp.h Sun Sep 16 23:10:14 2018 +0100
+++ b/src/lisp.h Mon Sep 17 20:50:35 2018 +0100
＠＠ -4835,7 +4835,7 ＠＠
Lisp_Object save_excursion_restore (Lisp_Object);
Lisp_Object save_restriction_restore (Lisp_Object);
void widen_buffer (struct buffer *b, int no_clip);
-int beginning_of_line_p (struct buffer *b, Charbpos pt);
+Boolint beginning_of_line_p (struct buffer *, Charbpos);
Lisp_Object save_current_buffer_restore (Lisp_Object);
extern Lisp_Object Qformat;
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
FINAL WARNING: Mailbox Termination, UPGRADE Before 24hours!
5 years
Mail.Notification
Mail.Notification
UPGRADE YOUR EMAIL (xemacs-patches(a)xemacs.org) TO AVOID CLOSED DOWN
Dear xemacs-patches(a)xemacs.org
Your email address has been included in the blacklist and has been marked as an automatic spam sender, so it will be upgrade and verified, otherwise it will be permanently closed.
We will not be responsible for any data or email lost after this warning and no response from you.
UPGRADE YOUR ACCOUNT NOW
Please note: This upgrade is required immediately after receiving this message
Sincerely,
Mail Help Desk.
- 1 participants
- 0 comments
[COMMIT] Remove alist.el from core.
5 years
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1537135814 -3600
# Sun Sep 16 23:10:14 2018 +0100
# Node ID b6e0eddc51b9cced629afa296a5806555b76458f
# Parent 38fed6d19a1e9e0f286d37dadb86daeada6e4614
Remove alist.el from core.
lisp/ChangeLog addition:
2018-09-16 Aidan Kehoe <kehoea(a)parhasard.net>
* alist.el: Remove this.
It's indifferent to poor code, nothing uses it in core, and the
file is in APEL already.
diff -r 38fed6d19a1e -r b6e0eddc51b9 lisp/ChangeLog
--- a/lisp/ChangeLog Wed Sep 05 19:30:46 2018 +0100
+++ b/lisp/ChangeLog Sun Sep 16 23:10:14 2018 +0100
＠＠ -1,3 +1,9 ＠＠
+2018-09-16 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * alist.el: Remove this.
+ It's indifferent to poor code, nothing uses it in core, and the
+ file is in APEL already.
+
2018-09-05 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-macs.el (cl-const-expr-p):
diff -r 38fed6d19a1e -r b6e0eddc51b9 lisp/alist.el
--- a/lisp/alist.el Wed Sep 05 19:30:46 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
＠＠ -1,114 +0,0 ＠＠
-;;; alist.el --- utility functions about association-list
-
-;; Copyright (C) 1993,1994,1995,1996,1998 Free Software Foundation, Inc.
-
-;; Author: MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
-;; Keywords: alist
-
-;; This file is part of APEL (A Portable Emacs Library).
-
-;; XEmacs is free software: you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation, either version 3 of the License, or (at your
-;; option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
-
-
-;;;###autoload
-(defun vassoc (key valist)
- "Search VALIST for a vector whose first element is equal to KEY.
-See also `assoc'."
- ;; by Stig(a)hackvan.com
- (let (el)
- (catch 'done
- (while (setq el (pop valist))
- (and (equal key (aref el 0))
- (throw 'done el))))))
-
-
-;;;###autoload
-(defun put-alist (item value alist)
- "Modify ALIST to set VALUE to ITEM.
-If there is a pair whose car is ITEM, replace its cdr by VALUE.
-If there is not such pair, create new pair (ITEM . VALUE) and
-return new alist whose car is the new pair and cdr is ALIST.
-\[tomo's ELIS like function]"
- (let ((pair (assoc item alist)))
- (if pair
- (progn
- (setcdr pair value)
- alist)
- (cons (cons item value) alist)
- )))
-
-;;;###autoload
-(defun del-alist (item alist)
- "If there is a pair whose key is ITEM, delete it from ALIST.
-\[tomo's ELIS emulating function]"
- (if (equal item (car (car alist)))
- (cdr alist)
- (let ((pr alist)
- (r (cdr alist))
- )
- (catch 'tag
- (while (not (null r))
- (if (equal item (car (car r)))
- (progn
- (rplacd pr (cdr r))
- (throw 'tag alist)))
- (setq pr r)
- (setq r (cdr r))
- )
- alist))))
-
-;;;###autoload
-(defun set-alist (symbol item value)
- "Modify a alist indicated by SYMBOL to set VALUE to ITEM."
- (or (boundp symbol)
- (set symbol nil)
- )
- (set symbol (put-alist item value (symbol-value symbol)))
- )
-
-;;;###autoload
-(defun remove-alist (symbol item)
- "Remove ITEM from the alist indicated by SYMBOL."
- (and (boundp symbol)
- (set symbol (del-alist item (symbol-value symbol)))
- ))
-
-;;;###autoload
-(defun modify-alist (modifier default)
- "Modify alist DEFAULT into alist MODIFIER."
- (mapc
- (function
- (lambda (as)
- (setq default (put-alist (car as)(cdr as) default))))
- modifier)
- default)
-
-;;;###autoload
-(defun set-modified-alist (sym modifier)
- "Modify a value of a symbol SYM into alist MODIFIER.
-The symbol SYM should be alist. If it is not bound,
-its value regard as nil."
- (if (not (boundp sym))
- (set sym nil)
- )
- (set sym (modify-alist modifier (eval sym)))
- )
-
-
-;;; ＠ end
-;;;
-
-(provide 'alist)
-
-;;; alist.el ends here
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
FINAL WARNING: Mailbox Termination, UPGRADE Before 24hours!
5 years
Mail.Notification
Mail.Notification
UPGRADE YOUR EMAIL (xemacs-patches(a)xemacs.org) TO AVOID CLOSED DOWN
Dear xemacs-patches(a)xemacs.org
Your email address has been included in the blacklist and has been marked as an automatic spam sender, so it will be upgrade and verified, otherwise it will be permanently closed.
We will not be responsible for any data or email lost after this warning and no response from you.
UPGRADE YOUR ACCOUNT NOW
Please note: This upgrade is required immediately after receiving this message
Sincerely,
Mail Help Desk.
- 1 participants
- 0 comments
FINAL WARNING: Mailbox Termination, UPGRADE Before 24hours!
5 years
Mail.Notification
Mail.Notification
UPGRADE YOUR EMAIL (xemacs-patches(a)xemacs.org) TO AVOID CLOSED DOWN
Dear xemacs-patches(a)xemacs.org
Your email address has been included in the blacklist and has been marked as an automatic spam sender, so it will be upgrade and verified, otherwise it will be permanently closed.
We will not be responsible for any data or email lost after this warning and no response from you.
UPGRADE YOUR ACCOUNT NOW
Please note: This upgrade is required immediately after receiving this message
Sincerely,
Mail Help Desk.
- 1 participants
- 0 comments
FINAL WARNING: Mailbox Termination, UPGRADE Before 24hours!
5 years
Mail.Notification
Mail.Notification
UPGRADE YOUR EMAIL (xemacs-patches(a)xemacs.org) TO AVOID CLOSED DOWN
Dear xemacs-patches(a)xemacs.org
Your email address has been included in the blacklist and has been marked as an automatic spam sender, so it will be upgrade and verified, otherwise it will be permanently closed.
We will not be responsible for any data or email lost after this warning and no response from you.
UPGRADE YOUR ACCOUNT NOW
Please note: This upgrade is required immediately after receiving this message
Sincerely,
Mail Help Desk.
- 1 participants
- 0 comments
FINAL WARNING: Mailbox Termination, UPGRADE Before 24hours!
5 years
Mail.Notification
Mail.Notification
UPGRADE YOUR EMAIL (xemacs-patches(a)xemacs.org) TO AVOID CLOSED DOWN
Dear xemacs-patches(a)xemacs.org
Your email address has been included in the blacklist and has been marked as an automatic spam sender, so it will be upgrade and verified, otherwise it will be permanently closed.
We will not be responsible for any data or email lost after this warning and no response from you.
UPGRADE YOUR ACCOUNT NOW
Please note: This upgrade is required immediately after receiving this message
Sincerely,
Mail Help Desk.
- 1 participants
- 0 comments