aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-05-13 15:59:36 -0700
committerPaul Eggert2014-05-13 15:59:36 -0700
commit3246c8b11a6017b423fa73c3965ab184320b8a7c (patch)
tree1be19a0f6ae7e1ccfbbe329acef6e163cf13dd05 /src
parent27a69ff0e846a72f6f37fd1155facd1232cce8ed (diff)
downloademacs-3246c8b11a6017b423fa73c3965ab184320b8a7c.tar.gz
emacs-3246c8b11a6017b423fa73c3965ab184320b8a7c.zip
* keyboard.c (Qdeactivate_mark): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e79c163cb0c..587efbd79f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-05-13 Paul Eggert <eggert@cs.ucla.edu>
2
3 * keyboard.c (Qdeactivate_mark): Now static.
4
12014-05-13 Dmitry Antipov <dmantipov@yandex.ru> 52014-05-13 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 If available, use Xfixes extension to do pointer blanking. 7 If available, use Xfixes extension to do pointer blanking.
diff --git a/src/keyboard.c b/src/keyboard.c
index a5a9ad93047..26afc02ec23 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -235,7 +235,7 @@ static Lisp_Object read_key_sequence_remapped;
235 235
236static Lisp_Object Qinput_method_function; 236static Lisp_Object Qinput_method_function;
237 237
238Lisp_Object Qdeactivate_mark; 238static Lisp_Object Qdeactivate_mark;
239 239
240Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook; 240Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook;
241 241