Mercurial > hg > xemacs-beta
annotate lisp/misc.el @ 5914:bd4d2c8ef9cc
Use the existing C-level line number cache within #'line-number.
src/ChangeLog addition:
2015-05-15 Aidan Kehoe <kehoea@parhasard.net>
* buffer.c:
* buffer.c (Fline_number): New C implementation, using the line
number cache of line-number.c, with a new optional BUFFER
argument.
* buffer.c (syms_of_buffer):
Make it available to Lisp.
* line-number.c (buffer_line_number):
New argument, RESPECT-NARROWING, describing whether to count from
the beginning of the visible region or from the beginning of the
buffer.
* line-number.h:
* line-number.h (buffer_line_number): Update its declaration.
* redisplay.c (window_line_number): Call it with the new argument.
lisp/ChangeLog addition:
2015-05-15 Aidan Kehoe <kehoea@parhasard.net>
* simple.el:
* simple.el (line-number): Moved to buffer.c; we have an existing
line number cache in C, it's a shame not to have it available.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 15 May 2015 18:11:47 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 209 | 1 ;;; misc.el --- miscellaneous functions for XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1989, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: FSF | |
| 6 ;; Keywords: extensions, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
10 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
11 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
12 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
13 ;; option) any later version. |
| 209 | 14 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
15 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
16 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
17 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
18 ;; for more details. |
| 209 | 19 |
| 20 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
209
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 209 | 22 |
| 23 ;;; Synched up with: FSF 19.34. | |
| 24 | |
| 25 ;;; Commentary: | |
| 26 | |
| 27 ;; This file is dumped with XEmacs. | |
| 28 | |
| 29 ;; 06/11/1997 - Use char-(after|before) instead of | |
| 30 ;; (following|preceding)-char. -slb | |
| 31 | |
| 32 ;;; Code: | |
| 33 | |
| 34 (defun copy-from-above-command (&optional arg) | |
| 35 "Copy characters from previous nonblank line, starting just above point. | |
| 36 Copy ARG characters, but not past the end of that line. | |
| 37 If no argument given, copy the entire rest of the line. | |
| 38 The characters copied are inserted in the buffer before point." | |
| 39 (interactive "P") | |
| 40 (let ((cc (current-column)) | |
| 41 n | |
| 42 (string "")) | |
| 43 (save-excursion | |
| 44 (beginning-of-line) | |
| 45 (backward-char 1) | |
| 46 (skip-chars-backward "\ \t\n") | |
| 47 (move-to-column cc) | |
| 48 ;; Default is enough to copy the whole rest of the line. | |
| 49 (setq n (if arg (prefix-numeric-value arg) (point-max))) | |
| 50 ;; If current column winds up in middle of a tab, | |
| 51 ;; copy appropriate number of "virtual" space chars. | |
| 52 (if (< cc (current-column)) | |
| 53 (if (eq (char-before (point)) ?\t) | |
| 54 (progn | |
| 55 (setq string (make-string (min n (- (current-column) cc)) ?\ )) | |
| 56 (setq n (- n (min n (- (current-column) cc))))) | |
| 57 ;; In middle of ctl char => copy that whole char. | |
| 58 (backward-char 1))) | |
| 59 (setq string (concat string | |
| 60 (buffer-substring | |
| 61 (point) | |
| 62 (min (save-excursion (end-of-line) (point)) | |
| 63 (+ n (point))))))) | |
| 64 (insert string))) | |
| 65 | |
| 66 ;;; misc.el ends here |