mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 11:50:51 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/leim/quail/sisheng.el (sisheng-list): Don't bother with-case-table.

Browse source 
* lisp/eshell/em-smart.el (eshell-smart-scroll-window): Use
with-selected-window.
This commit is contained in:
Stefan Monnier 2014-07-08 15:15:28 -04:00
parent dee89b6708
commit 78478ff636
7 changed files with 74 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,5 +1,9 @@
2014-07-08 Stefan Monnier <monnier@iro.umontreal.ca> 2014-07-08 Stefan Monnier <monnier@iro.umontreal.ca>
* leim/quail/sisheng.el (sisheng-list): Don't bother with-case-table.
* eshell/em-smart.el (eshell-smart-scroll-window): Use
with-selected-window.
* xt-mouse.el (xterm-mouse-translate-1): Intern drag event (bug#17894). * xt-mouse.el (xterm-mouse-translate-1): Intern drag event (bug#17894).
Remove also pointless window&mark manipulation. Remove also pointless window&mark manipulation.

6
lisp/calendar/todo-mode.el
View file

@ -2117,7 +2117,8 @@ the item at point."
(save-excursion (save-excursion
(todo-item-start) (todo-item-start)
(if (re-search-forward (concat " \\[" (regexp-quote todo-comment-string) (if (re-search-forward (concat " \\[" (regexp-quote todo-comment-string)
": \\([^]]+\\)\\]") end t) ": \\([^]]+\\)\\]")
end t)
(if comment-delete (if comment-delete
(when (todo-y-or-n-p "Delete comment? ") (when (todo-y-or-n-p "Delete comment? ")
(delete-region (match-beginning 0) (match-end 0))) (delete-region (match-beginning 0) (match-end 0)))
@ -2148,7 +2149,8 @@ the item at point."
(cons item 0)))))) (cons item 0))))))
(when include-header (when include-header
(while (not (string-match (concat todo-date-string-start (while (not (string-match (concat todo-date-string-start
todo-date-pattern) new)) todo-date-pattern)
new))
(setq new (read-from-minibuffer (setq new (read-from-minibuffer
"Item must start with a date: " new)))) "Item must start with a date: " new))))
;; Ensure lines following hard newlines are indented. ;; Ensure lines following hard newlines are indented.

10
lisp/eshell/em-smart.el
View file

@ -188,7 +188,8 @@ The options are `begin', `after' or `end'."
(add-hook 'eshell-post-command-hook (add-hook 'eshell-post-command-hook
(function (function
(lambda () (lambda ()
(setq eshell-smart-command-done t))) t t) (setq eshell-smart-command-done t)))
t t)
(unless (eq eshell-review-quick-commands t) (unless (eq eshell-review-quick-commands t)
(add-hook 'eshell-post-command-hook (add-hook 'eshell-post-command-hook
@ -200,8 +201,7 @@ The options are `begin', `after' or `end'."
(unless eshell-currently-handling-window (unless eshell-currently-handling-window
(let ((inhibit-point-motion-hooks t) (let ((inhibit-point-motion-hooks t)
(eshell-currently-handling-window t)) (eshell-currently-handling-window t))
(save-selected-window (with-selected-window wind
(select-window wind)
(eshell-smart-redisplay))))) (eshell-smart-redisplay)))))
(defun eshell-refresh-windows (&optional frame) (defun eshell-refresh-windows (&optional frame)
@ -212,12 +212,12 @@ The options are `begin', `after' or `end'."
(lambda (wind) (lambda (wind)
(with-current-buffer (window-buffer wind) (with-current-buffer (window-buffer wind)
(if eshell-mode (if eshell-mode
(let (window-scroll-functions) (let (window-scroll-functions) ;;FIXME: Why?
(eshell-smart-scroll-window wind (window-start)) (eshell-smart-scroll-window wind (window-start))
(setq affected t)))))) (setq affected t))))))
0 frame) 0 frame)
(if affected (if affected
(let (window-scroll-functions) (let (window-scroll-functions) ;;FIXME: Why?
(eshell-redisplay))))) (eshell-redisplay)))))
(defun eshell-smart-display-setup () (defun eshell-smart-display-setup ()

53
lisp/leim/quail/sisheng.el
View file

@ -250,39 +250,38 @@ Example: nve5 -> nüe
;; Call quail-make-sisheng-rules for all syllables in sisheng-syllable-table. ;; Call quail-make-sisheng-rules for all syllables in sisheng-syllable-table.
;; ;;
(let (sisheng-list) (let (sisheng-list)
(with-case-table (standard-case-table) ;FIXME: Why? (dolist (syllable sisheng-syllable-table)
(dolist (syllable sisheng-syllable-table) (setq sisheng-list
(setq sisheng-list (append (quail-make-sisheng-rules syllable)
(append (quail-make-sisheng-rules syllable) sisheng-list)))
sisheng-list)))
(dolist (syllable sisheng-syllable-table) (dolist (syllable sisheng-syllable-table)
(setq sisheng-list (setq sisheng-list
(append (quail-make-sisheng-rules (upcase-initials syllable)) (append (quail-make-sisheng-rules (upcase-initials syllable))
sisheng-list))) sisheng-list)))
(dolist (syllable sisheng-syllable-table) (dolist (syllable sisheng-syllable-table)
(setq sisheng-list (setq sisheng-list
(append (quail-make-sisheng-rules (upcase syllable)) (append (quail-make-sisheng-rules (upcase syllable))
sisheng-list))) sisheng-list)))
(eval `(quail-define-rules (eval `(quail-define-rules
,@sisheng-list ,@sisheng-list
("lv5" ["lü"]) ("lv5" ["lü"])
("lve5" ["lüe"]) ("lve5" ["lüe"])
("nv5" ["nü"]) ("nv5" ["nü"])
("nve5" ["nüe"]) ("nve5" ["nüe"])
("Lv5" ["Lü"]) ("Lv5" ["Lü"])
("Lve5" ["Lüe"]) ("Lve5" ["Lüe"])
("Nv5" ["Nü"]) ("Nv5" ["Nü"])
("Nve5" ["Nüe"]) ("Nve5" ["Nüe"])
("LV5" ["LÜ"]) ("LV5" ["LÜ"])
("LVE5" ["LÜE"]) ("LVE5" ["LÜE"])
("NV5" ["NÜ"]) ("NV5" ["NÜ"])
("NVE5" ["NÜE"]))))) ("NVE5" ["NÜE"]))))
;; Local Variables: ;; Local Variables:
;; coding: utf-8 ;; coding: utf-8

1
lisp/minibuffer.el
View file

@ -3306,6 +3306,7 @@ the same set of elements."
(string-match completion-pcm--delim-wild-regex str (string-match completion-pcm--delim-wild-regex str
(car bounds))) (car bounds)))
(if (zerop (car bounds)) (if (zerop (car bounds))
;; FIXME: Don't hardcode "-" (bug#17559).
(mapconcat 'string str "-") (mapconcat 'string str "-")
;; If there's a boundary, it's trickier. The main use-case ;; If there's a boundary, it's trickier. The main use-case
;; we consider here is file-name completion. We'd like ;; we consider here is file-name completion. We'd like

53
lisp/server.el
View file

@ -794,32 +794,33 @@ This handles splitting the command if it would be bigger than
(error "Invalid terminal type")) (error "Invalid terminal type"))
(add-to-list 'frame-inherited-parameters 'client) (add-to-list 'frame-inherited-parameters 'client)
(let ((frame (let ((frame
(server-with-environment (process-get proc 'env) (server-with-environment
'("LANG" "LC_CTYPE" "LC_ALL" (process-get proc 'env)
;; For tgetent(3); list according to ncurses(3). '("LANG" "LC_CTYPE" "LC_ALL"
"BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES" ;; For tgetent(3); list according to ncurses(3).
"NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
"NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO" "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
"TERMINFO_DIRS" "TERMPATH" "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
;; rxvt wants these "TERMINFO_DIRS" "TERMPATH"
"COLORFGBG" "COLORTERM") ;; rxvt wants these
(make-frame `((window-system . nil) "COLORFGBG" "COLORTERM")
(tty . ,tty) (make-frame `((window-system . nil)
(tty-type . ,type) (tty . ,tty)
;; Ignore nowait here; we always need to (tty-type . ,type)
;; clean up opened ttys when the client dies. ;; Ignore nowait here; we always need to
(client . ,proc) ;; clean up opened ttys when the client dies.
;; This is a leftover from an earlier (client . ,proc)
;; attempt at making it possible for process ;; This is a leftover from an earlier
;; run in the server process to use the ;; attempt at making it possible for process
;; environment of the client process. ;; run in the server process to use the
;; It has no effect now and to make it work ;; environment of the client process.
;; we'd need to decide how to make ;; It has no effect now and to make it work
;; process-environment interact with client ;; we'd need to decide how to make
;; envvars, and then to change the ;; process-environment interact with client
;; C functions `child_setup' and ;; envvars, and then to change the
;; `getenv_internal' accordingly. ;; C functions `child_setup' and
(environment . ,(process-get proc 'env))))))) ;; `getenv_internal' accordingly.
(environment . ,(process-get proc 'env)))))))
;; ttys don't use the `display' parameter, but callproc.c does to set ;; ttys don't use the `display' parameter, but callproc.c does to set
;; the DISPLAY environment on subprocesses. ;; the DISPLAY environment on subprocesses.

16
lisp/term.el
View file

@ -165,15 +165,13 @@
;; full advantage of this package ;; full advantage of this package
;; ;;
;; (add-hook 'term-mode-hook ;; (add-hook 'term-mode-hook
;; (function ;; (function
;; (lambda () ;; (lambda ()
;; (setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *") ;; (setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *")
;; (make-local-variable 'mouse-yank-at-point) ;; (setq-local mouse-yank-at-point t)
;; (make-local-variable 'transient-mark-mode) ;; (setq-local transient-mark-mode nil)
;; (setq mouse-yank-at-point t) ;; (auto-fill-mode -1)
;; (setq transient-mark-mode nil) ;; (setq tab-width 8 ))))
;; (auto-fill-mode -1)
;; (setq tab-width 8 ))))
;; ;;
;; ;;
;; ---------------------------------------- ;; ----------------------------------------