-;;; bindings.el --- define standard key bindings and some variables.
+;;; bindings.el --- define standard key bindings and some variables
;; Copyright (C) 1985,86,87,92,93,94,95,96,99,2000, 2001
;; Free Software Foundation, Inc.
;;; Code:
-(defun make-mode-line-mouse2-map (f) "\
-Return a keymap with single entry for mouse-2 on mode line.
-This is defined to run function F with no args in the buffer
+(defun make-mode-line-mouse-map (mouse function) "\
+Return a keymap with single entry for mouse key MOUSE on the mode line.
+MOUSE is defined to run function FUNCTION with no args in the buffer
corresponding to the mode line clicked."
(let ((map (make-sparse-keymap)))
- (define-key map [mode-line mouse-2] f)
+ (define-key map (vector 'mode-line mouse) function)
map))
(describe-current-input-method))))
(purecopy map)))
+
+(defvar mode-line-coding-system-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map [mode-line mouse-3]
+ (lambda (e)
+ (interactive "e")
+ (save-selected-window
+ (select-window (posn-window (event-start e)))
+ (when (and enable-multibyte-characters
+ buffer-file-coding-system)
+ (describe-coding-system buffer-file-coding-system)))))
+ (purecopy map))
+ "Local keymap for the coding-system part of the mode line.")
+
+
(defvar mode-line-mule-info
`(""
(current-input-method
- (:eval
- ,(purecopy
- '(propertize current-input-method-title
- 'help-echo (concat
- "Input method: "
- current-input-method
- ". mouse-2 disables, mouse-3 describes")
- 'local-map mode-line-input-method-map))))
+ (:propertize ("" current-input-method-title)
+ help-echo (concat
+ "Input method: "
+ current-input-method
+ ". mouse-2: disable, mouse-3: describe")
+ local-map ,mode-line-input-method-map))
,(propertize
"%Z"
- 'help-echo
- (purecopy (lambda (window object point)
- (save-window-excursion
- (select-window window)
- (if enable-multibyte-characters
- (concat (symbol-name buffer-file-coding-system)
- " buffer; see M-x describe-coding-system")
- (concat "Unibyte "
- (symbol-name buffer-file-coding-system)
- " buffer")))))))
+ 'help-echo
+ #'(lambda (window object point)
+ (with-current-buffer (window-buffer window)
+ ;; Don't show this tip if the coding system is nil,
+ ;; it reads like a bug, and is not useful anyway.
+ (when buffer-file-coding-system
+ (if enable-multibyte-characters
+ (concat (symbol-name buffer-file-coding-system)
+ " buffer; mouse-3: describe coding system")
+ (concat "Unibyte " (symbol-name buffer-file-coding-system)
+ " buffer")))))
+ 'local-map mode-line-coding-system-map))
"Mode-line control for displaying information of multilingual environment.
Normally it displays current input method (if any activated) and
mnemonics of the following coding systems:
coding system for saving or writing the current buffer
coding system for keyboard input (if Emacs is running on terminal)
coding system for terminal output (if Emacs is running on terminal)"
-;; Currently not:
+;;; Currently not:
;;; coding system for decoding output of buffer process (if any)
;;; coding system for encoding text to send to buffer process (if any)."
)
(make-variable-buffer-local 'mode-line-buffer-identification)
-(defvar mode-line-frame-identification '("-%F "))
+(defvar mode-line-frame-identification '("-%F ")
+ "Mode-line control to describe the current frame.")
(defvar mode-line-process nil "\
Mode-line control for displaying info on process status.
(list (propertize
"%1*"
'help-echo (purecopy (lambda (window object point)
- (format "%sead-only: mouse-2 toggles"
+ (format "%sead-only: mouse-3 toggles"
(save-selected-window
(select-window window)
(if buffer-read-only
"R"
"Not r")))))
- 'local-map (purecopy (make-mode-line-mouse2-map
+ 'local-map (purecopy (make-mode-line-mouse-map
+ 'mouse-3
#'mode-line-toggle-read-only)))
(propertize
"%1+"
'help-echo (purecopy (lambda (window object point)
- (format "%sodified: mouse-2 toggles flag"
+ (format "%sodified: mouse-3 toggles"
(save-selected-window
(select-window window)
(if (buffer-modified-p)
"M"
"Not m")))))
- 'local-map (purecopy (make-mode-line-mouse2-map
- #'mode-line-toggle-modified))))
+ 'local-map (purecopy (make-mode-line-mouse-map
+ 'mouse-3 #'mode-line-toggle-modified))))
"Mode-line control for displaying whether current buffer is modified.")
(make-variable-buffer-local 'mode-line-modified)
-(setq-default mode-line-format
- (let* ((help-echo
- ;; The multi-line message doesn't work terribly well on the
- ;; bottom mode line... Better ideas?
-;;; "\
-;;; mouse-1: select window, mouse-2: delete others, mouse-3: delete,
-;;; drag-mouse-1: resize, C-mouse-2: split horizontally"
- "mouse-1: select window, mouse-2: delete others, mouse-3: delete ...")
- (dashes (propertize "--" 'help-echo help-echo)))
+;; Actual initialization is below.
+(defvar mode-line-position nil
+ "Mode-line control for displaying line number, column number and fraction.")
+
+(defvar mode-line-modes nil
+ "Mode-line control for displaying major and minor modes.")
+
+(defvar mode-line-minor-mode-keymap nil "\
+Keymap to display on major and minor modes.")
+
+;; Menu of minor modes.
+(let ((map (make-sparse-keymap)))
+ (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1)
+ (define-key map [header-line down-mouse-3] 'mode-line-mode-menu-1)
+ (setq mode-line-minor-mode-keymap map))
+
+(let* ((help-echo
+ ;; The multi-line message doesn't work terribly well on the
+ ;; bottom mode line... Better ideas?
+ ;; "\
+ ;; mouse-1: select window, mouse-2: delete others, mouse-3: delete,
+ ;; drag-mouse-1: resize, C-mouse-2: split horizontally"
+ "mouse-1: select (drag to resize), mouse-2: delete others, mouse-3: delete")
+ (dashes (propertize "--" 'help-echo help-echo)))
+ (setq-default mode-line-format
(list
(propertize "-" 'help-echo help-echo)
'mode-line-mule-info
'mode-line-frame-identification
'mode-line-buffer-identification
(propertize " " 'help-echo help-echo)
- 'global-mode-string
- (propertize " %[(" 'help-echo help-echo)
- '(:eval (mode-line-mode-name)) 'mode-line-process 'minor-mode-alist
- (propertize "%n" 'help-echo "mouse-2: widen"
- 'local-map (make-mode-line-mouse2-map #'mode-line-widen))
- (propertize ")%]--" 'help-echo help-echo)
+ 'mode-line-position
+ '(vc-mode vc-mode)
+ (propertize " " 'help-echo help-echo)
+ 'mode-line-modes
`(which-func-mode ("" which-func-format ,dashes))
- `(line-number-mode ("L%l" ,dashes))
- `(column-number-mode ("C%c" ,dashes))
- (purecopy '(-3 . "%p"))
- (propertize "-%-" 'help-echo help-echo))))
+ `(global-mode-string (,dashes global-mode-string))
+ (propertize "-%-" 'help-echo help-echo)))
-(defvar minor-mode-alist nil "\
-Alist saying how to show minor modes in the mode line.
-Each element looks like (VARIABLE STRING);
-STRING is included in the mode line iff VARIABLE's value is non-nil.
-
-Actually, STRING need not be a string; any possible mode-line element
-is okay. See `mode-line-format'.")
-;; Don't use purecopy here--some people want to change these strings.
-(setq minor-mode-alist
- (list
- (list 'abbrev-mode
- (propertize " Abbrev"
- 'help-echo (purecopy
- "mouse-2: turn off Abbrev mode")
- 'local-map (purecopy (make-mode-line-mouse2-map
- #'mode-line-abbrev-mode))))
- '(overwrite-mode overwrite-mode)
- (list 'auto-fill-function
- (propertize " Fill"
- 'help-echo (purecopy
- "mouse-2: turn off Autofill mode")
- 'local-map (purecopy (make-mode-line-mouse2-map
- #'mode-line-auto-fill-mode))))
- ;; not really a minor mode...
- '(defining-kbd-macro " Def")))
+ (setq-default mode-line-modes
+ (list
+ (propertize "%[(" 'help-echo help-echo)
+ `(:propertize ("" mode-name mode-line-process minor-mode-alist)
+ help-echo "mouse-3: minor mode menu"
+ local-map ,mode-line-minor-mode-keymap)
+ (propertize "%n" 'help-echo "mouse-2: widen"
+ 'local-map (make-mode-line-mouse-map
+ 'mouse-2 #'mode-line-widen))
+ (propertize ")%]--" 'help-echo help-echo)))
+
+ (setq-default mode-line-position
+ `((-3 . ,(propertize "%p" 'help-echo help-echo))
+ (line-number-mode
+ ((column-number-mode
+ (10 ,(propertize " (%l,%c)" 'help-echo help-echo))
+ (6 ,(propertize " L%l" 'help-echo help-echo))))
+ ((column-number-mode
+ (5 ,(propertize " C%c" 'help-echo help-echo))))))))
(defvar mode-line-buffer-identification-keymap nil "\
Keymap for what is displayed by `mode-line-buffer-identification'.")
-(defvar mode-line-minor-mode-keymap nil "\
-Keymap for what is displayed by `mode-line-mode-name'.")
+(defun last-buffer () "\
+Return the last non-hidden buffer in the buffer list."
+ ;; This logic is more or less copied from bury-buffer,
+ ;; except that we reverse the buffer list.
+ (let ((list (nreverse (buffer-list (selected-frame))))
+ (pred (frame-parameter nil 'buffer-predicate))
+ found notsogood)
+ (while (and list (not found))
+ (unless (or (eq (aref (buffer-name (car list)) 0) ? )
+ ;; If the selected frame has a buffer_predicate,
+ ;; disregard buffers that don't fit the predicate.
+ (and pred (not (funcall pred (car list)))))
+ (if (get-buffer-window (car list) 'visible)
+ (or notsogood (eq (car list) (current-buffer)))
+ (setq found (car list))))
+ (pop list))
+ (or found notsogood
+ (get-buffer "*scratch*")
+ (progn
+ (set-buffer-major-mode
+ (get-buffer-create "*scratch*"))
+ (get-buffer "*scratch*")))))
+
+(defun unbury-buffer () "\
+Switch to the last buffer in the buffer list."
+ (interactive)
+ (switch-to-buffer (last-buffer)))
-(defvar mode-line-mode-menu-keymap nil "\
-Keymap for mode operations menu in the mode line.")
+(defun mode-line-unbury-buffer (event) "\
+Call `unbury-buffer' in this window."
+ (interactive "e")
+ (save-selected-window
+ (select-window (posn-window (event-start event)))
+ (unbury-buffer)))
-(defun mode-line-unbury-buffer () "\
-Switch to the last buffer in the buffer list that is not hidden."
- (interactive)
- (let ((list (reverse (buffer-list))))
- (while (eq (aref (buffer-name (car list)) 0) ? )
- (setq list (cdr list)))
- (switch-to-buffer (car list))))
+(defun mode-line-bury-buffer (event) "\
+Like `bury-buffer', but temporarily select EVENT's window."
+ (interactive "e")
+ (save-selected-window
+ (select-window (posn-window (event-start event)))
+ (bury-buffer)))
(defun mode-line-other-buffer () "\
Switch to the most recently selected buffer other than the current one."
(if binding
(call-interactively binding)))))
-(defun mode-line-mode-name () "\
-Return a string to display in the mode line for the current mode name."
- (let (length (result mode-name))
- (let ((local-map (get-text-property 0 'local-map result))
- (help-echo (get-text-property 0 'help-echo result)))
- (setq result (copy-sequence result))
- ;; Add `local-map' property if there isn't already one.
- (when (and (null local-map)
- (null (next-single-property-change 0 'local-map result)))
- (put-text-property 0 (length result)
- 'local-map mode-line-minor-mode-keymap result))
- ;; Add `help-echo' property if there isn't already one.
- (when (and (null help-echo)
- (null (next-single-property-change 0 'help-echo result)))
- (put-text-property 0 (length result)
- 'help-echo "mouse-3: minor mode menu" result)))
- result))
-
(defmacro bound-and-true-p (var)
"Return the value of symbol VAR if it is bound, else nil."
`(and (boundp (quote ,var)) ,var))
(define-key mode-line-mode-menu [overwrite-mode]
- `(menu-item ,(purecopy "Overwrite") overwrite-mode
+ `(menu-item ,(purecopy "Overwrite (Ovwrt)") overwrite-mode
:button (:toggle . overwrite-mode)))
(define-key mode-line-mode-menu [outline-minor-mode]
- `(menu-item ,(purecopy "Outline") outline-minor-mode
+ `(menu-item ,(purecopy "Outline (Outl)") outline-minor-mode
:button (:toggle . (bound-and-true-p outline-minor-mode))))
(define-key mode-line-mode-menu [line-number-mode]
`(menu-item ,(purecopy "Line number") line-number-mode
:button (:toggle . line-number-mode)))
(define-key mode-line-mode-menu [highlight-changes-mode]
- `(menu-item ,(purecopy "Highlight changes") highlight-changes-mode
+ `(menu-item ,(purecopy "Highlight changes (Chg)") highlight-changes-mode
:button (:toggle . highlight-changes-mode)))
(define-key mode-line-mode-menu [glasses-mode]
- `(menu-item ,(purecopy "Glasses") glasses-mode
+ `(menu-item ,(purecopy "Glasses (o^o)") glasses-mode
:button (:toggle . (bound-and-true-p glasses-mode))))
(define-key mode-line-mode-menu [hide-ifdef-mode]
- `(menu-item ,(purecopy "Hide ifdef") hide-ifdef-mode
+ `(menu-item ,(purecopy "Hide ifdef (Ifdef)") hide-ifdef-mode
:button (:toggle . (bound-and-true-p hide-ifdef-mode))))
(define-key mode-line-mode-menu [font-lock-mode]
- `(menu-item ,(purecopy "Font-lock") font-lock-mode
+ `(menu-item ,(purecopy "Font Lock") font-lock-mode
:button (:toggle . font-lock-mode)))
(define-key mode-line-mode-menu [flyspell-mode]
- `(menu-item ,(purecopy "Flyspell") flyspell-mode
+ `(menu-item ,(purecopy "Flyspell (Fly)") flyspell-mode
:button (:toggle . (bound-and-true-p flyspell-mode))))
(define-key mode-line-mode-menu [column-number-mode]
`(menu-item ,(purecopy "Column number") column-number-mode
:button (:toggle . column-number-mode)))
(define-key mode-line-mode-menu [auto-fill-mode]
- `(menu-item ,(purecopy "Auto-fill") auto-fill-mode
+ `(menu-item ,(purecopy "Auto Fill (Fill)") auto-fill-mode
:button (:toggle . auto-fill-function)))
(define-key mode-line-mode-menu [auto-revert-mode]
- `(menu-item ,(purecopy "Auto revert") auto-revert-mode
+ `(menu-item ,(purecopy "Auto revert (ARev)") auto-revert-mode
:button (:toggle . auto-revert-mode)))
(define-key mode-line-mode-menu [abbrev-mode]
- `(menu-item ,(purecopy "Abbrev") abbrev-mode
+ `(menu-item ,(purecopy "Abbrev (Abbrev)") abbrev-mode
:button (:toggle . abbrev-mode)))
(defun mode-line-mode-menu (event)
(x-popup-menu event mode-line-mode-menu))
;; Add menu of buffer operations to the buffer identification part
-;; of the mode line.
+;; of the mode line.or header line.
+;
(let ((map (make-sparse-keymap)))
- (define-key map [mode-line mouse-1] 'mode-line-other-buffer)
- (define-key map [header-line mouse-1] 'mode-line-other-buffer)
- (define-key map [mode-line M-mouse-2] 'mode-line-unbury-buffer)
- (define-key map [header-line M-mouse-2] 'mode-line-unbury-buffer)
- (define-key map [mode-line mouse-2] 'bury-buffer)
- (define-key map [header-line mouse-2] 'bury-buffer)
- (define-key map [mode-line down-mouse-3] 'mouse-buffer-menu)
- (define-key map [header-line down-mouse-3] 'mouse-buffer-menu)
+ ;; Bind down- events so that the global keymap won't ``shine
+ ;; through''.
+ (define-key map [mode-line down-mouse-1] 'ignore)
+ (define-key map [mode-line mouse-1] 'mode-line-unbury-buffer)
+ (define-key map [header-line down-mouse-1] 'ignore)
+ (define-key map [header-line mouse-1] 'mode-line-unbury-buffer)
+ (define-key map [header-line down-mouse-3] 'ignore)
+ (define-key map [mode-line mouse-3] 'mode-line-bury-buffer)
+ (define-key map [header-line down-mouse-3] 'ignore)
+ (define-key map [header-line mouse-3] 'mode-line-bury-buffer)
(setq mode-line-buffer-identification-keymap map))
(defun propertized-buffer-identification (fmt)
text properties for face, help-echo, and local-map to it."
(list (propertize fmt
'face '(:weight bold)
- 'help-echo (purecopy "mouse-1: other \
-buffer, mouse-2: prev, M-mouse-2: next, mouse-3: buffer menu")
+ 'help-echo
+ (purecopy "mouse-1: previous buffer, mouse-3: next buffer")
'local-map mode-line-buffer-identification-keymap)))
-
+
(setq-default mode-line-buffer-identification
(propertized-buffer-identification "%12b"))
-;; Menu of minor modes.
-(let ((map (make-sparse-keymap)))
- (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1)
- (define-key map [header-line down-mouse-3] 'mode-line-mode-menu-1)
- (setq mode-line-minor-mode-keymap map))
+(defvar minor-mode-alist nil "\
+Alist saying how to show minor modes in the mode line.
+Each element looks like (VARIABLE STRING);
+STRING is included in the mode line iff VARIABLE's value is non-nil.
+
+Actually, STRING need not be a string; any possible mode-line element
+is okay. See `mode-line-format'.")
+;; Don't use purecopy here--some people want to change these strings.
+(setq minor-mode-alist
+ (list
+ (list 'abbrev-mode " Abbrev")
+ '(overwrite-mode overwrite-mode)
+ (list 'auto-fill-function " Fill")
+ ;; not really a minor mode...
+ '(defining-kbd-macro " Def")))
;; These variables are used by autoloadable packages.
;; They are defined here so that they do not get overridden
;; making it more likely you will get a unique match.
(setq completion-ignored-extensions
(append
- (cond ((or (eq system-type 'ms-dos) (eq system-type 'windows-nt))
- '(".o" "~" ".bin" ".bak" ".obj" ".map"
- ".a" ".ln" ".blg" ".bbl"))
+ (cond ((memq system-type '(ms-dos windows-nt))
+ '(".o" "~" ".bin" ".bak" ".obj" ".map" ".ico" ".pif" ".lnk"
+ ".a" ".ln" ".blg" ".bbl" ".dll" ".drv" ".vxd" ".386"))
((eq system-type 'vax-vms)
'(".obj" ".exe" ".bin" ".lbin" ".sbin"
- ".brn" ".rnt" ".mem" ".lni" ".lis"
+ ".brn" ".rnt" ".lni" ".lis"
".olb" ".tlb" ".mlb" ".hlb"))
(t
- '(".o" "~" ".bin" ".lbin" ".fasl" ".ufsl"
+ '(".o" "~" ".bin" ".lbin" ".so"
".a" ".ln" ".blg" ".bbl")))
'(".elc" ".lof"
".glo" ".idx" ".lot"
".dvi" ".fmt" ".tfm" ".pdf"
;; Java compiled
".class"
- ;; Clisp
- ".fas" ".lib"
+ ;; CLISP
+ ".fas" ".lib" ".mem"
;; CMUCL
".x86f" ".sparcf"
+ ;; Other CL implementations (Allegro, LispWorks)
+ ".fasl" ".ufsl" ".fsl" ".dxl"
;; Libtool
".lo" ".la"
+ ;; Gettext
+ ".gmo" ".mo"
;; Texinfo-related
".toc" ".log" ".aux"
".cp" ".fn" ".ky" ".pg" ".tp" ".vr"
".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs")))
+;; Suffixes used for executables.
+(setq exec-suffixes
+ (cond
+ ((memq system-type '(ms-dos windows-nt))
+ '(".exe" ".com" ".bat" ".cmd" ".btm" ""))
+ (t
+ '(""))))
+
;; Packages should add to this list appropriately when they are
;; loaded, rather than listing everything here.
(setq debug-ignored-errors
"^Save not confirmed$"
"^Recover-file cancelled\\.$"
"^Cannot switch buffers in a dedicated window$"
-
+
;; ediff
"^Errors in diff output. Diff output is in "
"^Hmm... I don't see an Ediff command around here...$"
(make-variable-buffer-local 'indent-tabs-mode)
;; We have base64 and md5 functions built in now.
-(add-to-list 'features 'base64)
-(add-to-list 'features 'md5)
-(add-to-list 'features 'overlay)
+(provide 'base64)
+(provide 'md5)
+(provide 'overlay '(display syntax-table field))
+(provide 'text-properties '(display syntax-table field point-entered))
(define-key esc-map "\t" 'complete-symbol)
(make-variable-buffer-local 'minor-mode-overriding-map-alist)
+;; From frame.c
+(global-set-key [switch-frame] 'handle-switch-frame)
+(global-set-key [delete-frame] 'handle-delete-frame)
+(global-set-key [iconify-frame] 'ignore-event)
+(global-set-key [make-frame-visible] 'ignore-event)
+
+
;These commands are defined in editfns.c
;but they are not assigned to keys there.
(put 'narrow-to-region 'disabled t)
(define-key esc-map "!" 'shell-command)
(define-key esc-map "|" 'shell-command-on-region)
-;; This is an experiment--make up and down arrows do history.
-(define-key minibuffer-local-map [up] 'previous-history-element)
-(define-key minibuffer-local-map [down] 'next-history-element)
-(define-key minibuffer-local-ns-map [up] 'previous-history-element)
-(define-key minibuffer-local-ns-map [down] 'next-history-element)
-(define-key minibuffer-local-completion-map [up] 'previous-history-element)
-(define-key minibuffer-local-completion-map [down] 'next-history-element)
-(define-key minibuffer-local-must-match-map [up] 'previous-history-element)
-(define-key minibuffer-local-must-match-map [down] 'next-history-element)
+(let ((map minibuffer-local-map))
+ (define-key map "\en" 'next-history-element)
+ (define-key map [next] 'next-history-element)
+ (define-key map [down] 'next-history-element)
+ (define-key map "\ep" 'previous-history-element)
+ (define-key map [prior] 'previous-history-element)
+ (define-key map [up] 'previous-history-element)
+ (define-key map "\es" 'next-matching-history-element)
+ (define-key map "\er" 'previous-matching-history-element))
(define-key global-map "\C-u" 'universal-argument)
(let ((i ?0))
;;(defun function-key-error ()
;; (interactive)
-;; (error "That function key is not bound to anything."))
+;; (error "That function key is not bound to anything"))
(define-key global-map [menu] 'execute-extended-command)
(define-key global-map [find] 'search-forward)
(define-key function-key-map [backspace] [?\C-?])
(define-key function-key-map [delete] [?\C-?])
(define-key function-key-map [kp-delete] [?\C-?])
+(define-key function-key-map [S-kp-end] [S-end])
+(define-key function-key-map [S-kp-down] [S-down])
+(define-key function-key-map [S-kp-next] [S-next])
+(define-key function-key-map [S-kp-left] [S-left])
+(define-key function-key-map [S-kp-right] [S-right])
+(define-key function-key-map [S-kp-home] [S-home])
+(define-key function-key-map [S-kp-up] [S-up])
+(define-key function-key-map [S-kp-prior] [S-prior])
+(define-key function-key-map [C-S-kp-end] [C-S-end])
+(define-key function-key-map [C-S-kp-down] [C-S-down])
+(define-key function-key-map [C-S-kp-next] [C-S-next])
+(define-key function-key-map [C-S-kp-left] [C-S-left])
+(define-key function-key-map [C-S-kp-right] [C-S-right])
+(define-key function-key-map [C-S-kp-home] [C-S-home])
+(define-key function-key-map [C-S-kp-up] [C-S-up])
+(define-key function-key-map [C-S-kp-prior] [C-S-prior])
+;; Don't bind shifted keypad numeric keys, they reportedly
+;; interfere with the feature of some keyboards to produce
+;; numbers when NumLock is off.
+;(define-key function-key-map [S-kp-1] [S-end])
+;(define-key function-key-map [S-kp-2] [S-down])
+;(define-key function-key-map [S-kp-3] [S-next])
+;(define-key function-key-map [S-kp-4] [S-left])
+;(define-key function-key-map [S-kp-6] [S-right])
+;(define-key function-key-map [S-kp-7] [S-home])
+;(define-key function-key-map [S-kp-8] [S-up])
+;(define-key function-key-map [S-kp-9] [S-prior])
+(define-key function-key-map [C-S-kp-1] [C-S-end])
+(define-key function-key-map [C-S-kp-2] [C-S-down])
+(define-key function-key-map [C-S-kp-3] [C-S-next])
+(define-key function-key-map [C-S-kp-4] [C-S-left])
+(define-key function-key-map [C-S-kp-6] [C-S-right])
+(define-key function-key-map [C-S-kp-7] [C-S-home])
+(define-key function-key-map [C-S-kp-8] [C-S-up])
+(define-key function-key-map [C-S-kp-9] [C-S-prior])
(define-key global-map [mouse-movement] 'ignore)
(define-key ctl-x-map "\C-t" 'transpose-lines)
(define-key esc-map ";" 'comment-dwim)
-(define-key esc-map "j" 'comment-indent-new-line)
-(define-key esc-map "\C-j" 'comment-indent-new-line)
+(define-key esc-map "j" 'indent-new-comment-line)
+(define-key esc-map "\C-j" 'indent-new-comment-line)
(define-key ctl-x-map ";" 'comment-set-column)
(define-key ctl-x-map "f" 'set-fill-column)
(define-key ctl-x-map "$" 'set-selective-display)
(define-key ctl-x-map "z" 'repeat)
-;;; Don't compile this file; it contains no large function definitions.
-;;; Don't look for autoload cookies in this file.
-;;; Local Variables:
-;;; no-byte-compile: t
-;;; no-update-autoloads: t
-;;; End:
+;; Don't look for autoload cookies in this file.
+;; Local Variables:
+;; no-update-autoloads: t
+;; End:
;;; bindings.el ends here