Commit 78478ff6 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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

* lisp/eshell/em-smart.el (eshell-smart-scroll-window): Use
with-selected-window.
parent dee89b67
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).
Remove also pointless window&mark manipulation.
 
......
......@@ -2117,7 +2117,8 @@ the item at point."
(save-excursion
(todo-item-start)
(if (re-search-forward (concat " \\[" (regexp-quote todo-comment-string)
": \\([^]]+\\)\\]") end t)
": \\([^]]+\\)\\]")
end t)
(if comment-delete
(when (todo-y-or-n-p "Delete comment? ")
(delete-region (match-beginning 0) (match-end 0)))
......@@ -2148,7 +2149,8 @@ the item at point."
(cons item 0))))))
(when include-header
(while (not (string-match (concat todo-date-string-start
todo-date-pattern) new))
todo-date-pattern)
new))
(setq new (read-from-minibuffer
"Item must start with a date: " new))))
;; Ensure lines following hard newlines are indented.
......
......@@ -188,7 +188,8 @@ The options are `begin', `after' or `end'."
(add-hook 'eshell-post-command-hook
(function
(lambda ()
(setq eshell-smart-command-done t))) t t)
(setq eshell-smart-command-done t)))
t t)
(unless (eq eshell-review-quick-commands t)
(add-hook 'eshell-post-command-hook
......@@ -200,8 +201,7 @@ The options are `begin', `after' or `end'."
(unless eshell-currently-handling-window
(let ((inhibit-point-motion-hooks t)
(eshell-currently-handling-window t))
(save-selected-window
(select-window wind)
(with-selected-window wind
(eshell-smart-redisplay)))))
(defun eshell-refresh-windows (&optional frame)
......@@ -212,12 +212,12 @@ The options are `begin', `after' or `end'."
(lambda (wind)
(with-current-buffer (window-buffer wind)
(if eshell-mode
(let (window-scroll-functions)
(let (window-scroll-functions) ;;FIXME: Why?
(eshell-smart-scroll-window wind (window-start))
(setq affected t))))))
0 frame)
(if affected
(let (window-scroll-functions)
(let (window-scroll-functions) ;;FIXME: Why?
(eshell-redisplay)))))
(defun eshell-smart-display-setup ()
......
......@@ -250,39 +250,38 @@ Example: nve5 -> nüe
;; Call quail-make-sisheng-rules for all syllables in sisheng-syllable-table.
;;
(let (sisheng-list)
(with-case-table (standard-case-table) ;FIXME: Why?
(dolist (syllable sisheng-syllable-table)
(setq sisheng-list
(append (quail-make-sisheng-rules syllable)
sisheng-list)))
(dolist (syllable sisheng-syllable-table)
(setq sisheng-list
(append (quail-make-sisheng-rules (upcase-initials syllable))
sisheng-list)))
(dolist (syllable sisheng-syllable-table)
(setq sisheng-list
(append (quail-make-sisheng-rules (upcase syllable))
sisheng-list)))
(eval `(quail-define-rules
,@sisheng-list
("lv5" ["lü"])
("lve5" ["lüe"])
("nv5" ["nü"])
("nve5" ["nüe"])
("Lv5" ["Lü"])
("Lve5" ["Lüe"])
("Nv5" ["Nü"])
("Nve5" ["Nüe"])
("LV5" ["LÜ"])
("LVE5" ["LÜE"])
("NV5" ["NÜ"])
("NVE5" ["NÜE"])))))
(dolist (syllable sisheng-syllable-table)
(setq sisheng-list
(append (quail-make-sisheng-rules syllable)
sisheng-list)))
(dolist (syllable sisheng-syllable-table)
(setq sisheng-list
(append (quail-make-sisheng-rules (upcase-initials syllable))
sisheng-list)))
(dolist (syllable sisheng-syllable-table)
(setq sisheng-list
(append (quail-make-sisheng-rules (upcase syllable))
sisheng-list)))
(eval `(quail-define-rules
,@sisheng-list
("lv5" ["lü"])
("lve5" ["lüe"])
("nv5" ["nü"])
("nve5" ["nüe"])
("Lv5" ["Lü"])
("Lve5" ["Lüe"])
("Nv5" ["Nü"])
("Nve5" ["Nüe"])
("LV5" ["LÜ"])
("LVE5" ["LÜE"])
("NV5" ["NÜ"])
("NVE5" ["NÜE"]))))
;; Local Variables:
;; coding: utf-8
......
......@@ -3306,6 +3306,7 @@ the same set of elements."
(string-match completion-pcm--delim-wild-regex str
(car bounds)))
(if (zerop (car bounds))
;; FIXME: Don't hardcode "-" (bug#17559).
(mapconcat 'string str "-")
;; If there's a boundary, it's trickier. The main use-case
;; we consider here is file-name completion. We'd like
......
......@@ -794,32 +794,33 @@ This handles splitting the command if it would be bigger than
(error "Invalid terminal type"))
(add-to-list 'frame-inherited-parameters 'client)
(let ((frame
(server-with-environment (process-get proc 'env)
'("LANG" "LC_CTYPE" "LC_ALL"
;; For tgetent(3); list according to ncurses(3).
"BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
"NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
"NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
"TERMINFO_DIRS" "TERMPATH"
;; rxvt wants these
"COLORFGBG" "COLORTERM")
(make-frame `((window-system . nil)
(tty . ,tty)
(tty-type . ,type)
;; Ignore nowait here; we always need to
;; clean up opened ttys when the client dies.
(client . ,proc)
;; This is a leftover from an earlier
;; attempt at making it possible for process
;; run in the server process to use the
;; environment of the client process.
;; It has no effect now and to make it work
;; we'd need to decide how to make
;; process-environment interact with client
;; envvars, and then to change the
;; C functions `child_setup' and
;; `getenv_internal' accordingly.
(environment . ,(process-get proc 'env)))))))
(server-with-environment
(process-get proc 'env)
'("LANG" "LC_CTYPE" "LC_ALL"
;; For tgetent(3); list according to ncurses(3).
"BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
"NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
"NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
"TERMINFO_DIRS" "TERMPATH"
;; rxvt wants these
"COLORFGBG" "COLORTERM")
(make-frame `((window-system . nil)
(tty . ,tty)
(tty-type . ,type)
;; Ignore nowait here; we always need to
;; clean up opened ttys when the client dies.
(client . ,proc)
;; This is a leftover from an earlier
;; attempt at making it possible for process
;; run in the server process to use the
;; environment of the client process.
;; It has no effect now and to make it work
;; we'd need to decide how to make
;; process-environment interact with client
;; envvars, and then to change the
;; C functions `child_setup' and
;; `getenv_internal' accordingly.
(environment . ,(process-get proc 'env)))))))
;; ttys don't use the `display' parameter, but callproc.c does to set
;; the DISPLAY environment on subprocesses.
......
......@@ -165,15 +165,13 @@
;; full advantage of this package
;;
;; (add-hook 'term-mode-hook
;; (function
;; (lambda ()
;; (setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *")
;; (make-local-variable 'mouse-yank-at-point)
;; (make-local-variable 'transient-mark-mode)
;; (setq mouse-yank-at-point t)
;; (setq transient-mark-mode nil)
;; (auto-fill-mode -1)
;; (setq tab-width 8 ))))
;; (function
;; (lambda ()
;; (setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *")
;; (setq-local mouse-yank-at-point t)
;; (setq-local transient-mark-mode nil)
;; (auto-fill-mode -1)
;; (setq tab-width 8 ))))
;;
;;
;; ----------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment