aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-06-30 23:38:28 -0400
committerChong Yidong2011-06-30 23:38:28 -0400
commitddd63a1e1b46a0b34ffa2fc64ab9901fe7193e6b (patch)
tree9a1958034e9a8a0030fea9605c1dfee22f6826ef
parent055f492351fb96556e344af8fbf097f5367ab683 (diff)
downloademacs-ddd63a1e1b46a0b34ffa2fc64ab9901fe7193e6b.tar.gz
emacs-ddd63a1e1b46a0b34ffa2fc64ab9901fe7193e6b.zip
* eshell/em-smart.el (eshell-smart-display-navigate-list): Add mouse-yank-primary.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/eshell/em-smart.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a4e095bc4f..b43e8032829 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-07-01 Chong Yidong <cyd@stupidchicken.com>
2
3 * eshell/em-smart.el (eshell-smart-display-navigate-list): Add
4 mouse-yank-primary.
5
12011-07-01 Teodor Zlatanov <tzz@lifelogs.com> 62011-07-01 Teodor Zlatanov <tzz@lifelogs.com>
2 7
3 * progmodes/cfengine3.el: New file to support CFEngine 3.x. 8 * progmodes/cfengine3.el: New file to support CFEngine 3.x.
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index f08fec8f8fa..259072d9750 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -120,6 +120,7 @@ only if that output can be presented in its entirely in the Eshell window."
120(defcustom eshell-smart-display-navigate-list 120(defcustom eshell-smart-display-navigate-list
121 '(insert-parentheses 121 '(insert-parentheses
122 mouse-yank-at-click 122 mouse-yank-at-click
123 mouse-yank-primary
123 mouse-yank-secondary 124 mouse-yank-secondary
124 yank-pop 125 yank-pop
125 yank-rectangle 126 yank-rectangle