Mercurial > emacs
comparison lisp/emerge.el @ 1610:fc2b0405bd87
* bytecomp.el: Declare unread-command-char an obsolete variable.
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
vip-prefix-arg-com): Use unread-command-event instead of
unread-command-char; respect its new semantics.
* emerge.el (emerge-show-file-name): Same.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Mon, 16 Nov 1992 01:33:17 +0000 |
parents | 14a2a89cb634 |
children | 04fb1d3d6992 |
comparison
equal
deleted
inserted
replaced
1609:5beb9d2bc959 | 1610:fc2b0405bd87 |
---|---|
2063 (defun emerge-file-names () | 2063 (defun emerge-file-names () |
2064 "Show the names of the buffers or files being operated on by Emerge. | 2064 "Show the names of the buffers or files being operated on by Emerge. |
2065 Use C-u l to reset the windows afterward." | 2065 Use C-u l to reset the windows afterward." |
2066 (interactive) | 2066 (interactive) |
2067 (delete-other-windows) | 2067 (delete-other-windows) |
2068 (let ((temp-buffer-show-hook | 2068 (let ((temp-buffer-show-function |
2069 (function (lambda (buf) | 2069 (function (lambda (buf) |
2070 (split-window-vertically) | 2070 (split-window-vertically) |
2071 (switch-to-buffer buf) | 2071 (switch-to-buffer buf) |
2072 (other-window 1))))) | 2072 (other-window 1))))) |
2073 (with-output-to-temp-buffer "*Help*" | 2073 (with-output-to-temp-buffer "*Help*" |
2474 (cond ((= c ?a) | 2474 (cond ((= c ?a) |
2475 (insert-buffer-substring emerge-A-buffer A-begin A-end)) | 2475 (insert-buffer-substring emerge-A-buffer A-begin A-end)) |
2476 ((= c ?b) | 2476 ((= c ?b) |
2477 (insert-buffer-substring emerge-B-buffer B-begin B-end)) | 2477 (insert-buffer-substring emerge-B-buffer B-begin B-end)) |
2478 ((= c ?%) | 2478 ((= c ?%) |
2479 (insert ?%) | 2479 (insert ?%)) |
2480 (t | 2480 (t |
2481 (insert c))))) | 2481 (insert c)))) |
2482 (insert c))) | 2482 (insert c))) |
2483 (setq i (1+ i)))) | 2483 (setq i (1+ i)))) |
2484 (goto-char merge-begin) | 2484 (goto-char merge-begin) |
2485 (aset diff-vector 6 'combined) | 2485 (aset diff-vector 6 'combined) |
2486 (emerge-refresh-mode-line))) | 2486 (emerge-refresh-mode-line))) |
2908 (while (and (not (pos-visible-in-window-p)) | 2908 (while (and (not (pos-visible-in-window-p)) |
2909 (> (1- (frame-height)) (window-height))) | 2909 (> (1- (frame-height)) (window-height))) |
2910 (enlarge-window 1)) | 2910 (enlarge-window 1)) |
2911 (let ((c (read-char))) | 2911 (let ((c (read-char))) |
2912 (if (/= c 32) | 2912 (if (/= c 32) |
2913 (setq unread-command-char c)))))))) | 2913 (setq unread-command-event c)))))))) |
2914 | 2914 |
2915 ;; Improved auto-save file names. | 2915 ;; Improved auto-save file names. |
2916 ;; This function fixes many problems with the standard auto-save file names: | 2916 ;; This function fixes many problems with the standard auto-save file names: |
2917 ;; Auto-save files for non-file buffers get put in the default directory | 2917 ;; Auto-save files for non-file buffers get put in the default directory |
2918 ;; for the buffer, whether that makes sense or not. | 2918 ;; for the buffer, whether that makes sense or not. |