HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* play/dunnet.el (dun-doassign): Fixed bug where UNIX variable assignment without...
[bpt/emacs.git]
/
lisp
/
array.el
diff --git
a/lisp/array.el
b/lisp/array.el
index
d22d58c
..
ba72ad6
100644
(file)
--- a/
lisp/array.el
+++ b/
lisp/array.el
@@
-1,10
+1,9
@@
;;; array.el --- array editing commands for GNU Emacs
;;; array.el --- array editing commands for GNU Emacs
-;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2000-2014 Free Software Foundation, Inc.
;; Author: David M. Brown
;; Author: David M. Brown
-;; Maintainer:
FSF
+;; Maintainer:
emacs-devel@gnu.org
;; Keywords: extensions
;; This file is part of GNU Emacs.
;; Keywords: extensions
;; This file is part of GNU Emacs.
@@
-748,9
+747,7
@@
of `array-rows-numbered'."
(defun current-line ()
"Return the current buffer line at point. The first line is 0."
(defun current-line ()
"Return the current buffer line at point. The first line is 0."
- (save-excursion
- (beginning-of-line)
- (count-lines (point-min) (point))))
+ (count-lines (point-min) (line-beginning-position)))
(defun move-to-column-untabify (column)
"Move to COLUMN on the current line, untabifying if necessary.
(defun move-to-column-untabify (column)
"Move to COLUMN on the current line, untabifying if necessary.
@@
-803,7
+800,7
@@
Return COLUMN."
(put 'array-mode 'mode-class 'special)
;;;###autoload
(put 'array-mode 'mode-class 'special)
;;;###autoload
-(def
un array-mode ()
+(def
ine-derived-mode array-mode fundamental-mode "Array"
"Major mode for editing arrays.
Array mode is a specialized mode for editing arrays. An array is
"Major mode for editing arrays.
Array mode is a specialized mode for editing arrays. An array is
@@
-866,9
+863,6
@@
take a numeric prefix argument):
\\[array-display-local-variables] Display the current values of local variables.
Entering array mode calls the function `array-mode-hook'."
\\[array-display-local-variables] Display the current values of local variables.
Entering array mode calls the function `array-mode-hook'."
-
- (interactive)
- (kill-all-local-variables)
(make-local-variable 'array-buffer-line)
(make-local-variable 'array-buffer-column)
(make-local-variable 'array-row)
(make-local-variable 'array-buffer-line)
(make-local-variable 'array-buffer-column)
(make-local-variable 'array-row)
@@
-891,17
+885,12
@@
Entering array mode calls the function `array-mode-hook'."
(+ (floor (1- array-max-column) array-columns-per-line)
(if array-rows-numbered 2 1)))
(message "")
(+ (floor (1- array-max-column) array-columns-per-line)
(if array-rows-numbered 2 1)))
(message "")
- (setq major-mode 'array-mode)
- (setq mode-name "Array")
(force-mode-line-update)
(set (make-local-variable 'truncate-lines) t)
(force-mode-line-update)
(set (make-local-variable 'truncate-lines) t)
- (setq overwrite-mode 'overwrite-mode-textual)
- (use-local-map array-mode-map)
- (run-mode-hooks 'array-mode-hook))
+ (setq overwrite-mode 'overwrite-mode-textual))
\f
(provide 'array)
\f
(provide 'array)
-;; arch-tag: 0086605d-79fe-4a1a-992a-456417261f80
;;; array.el ends here
;;; array.el ends here