aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-10-20 18:02:40 -0400
committerStefan Monnier2014-10-20 18:02:40 -0400
commitd9a72916e54b1bef8ad2322e6833f643473877b6 (patch)
treed4cd6994eac2ea3d706d39d182e213b695272784 /src
parent1fc82d89a8a603754d17a35be1ce78e66d0b6fd6 (diff)
downloademacs-d9a72916e54b1bef8ad2322e6833f643473877b6.tar.gz
emacs-d9a72916e54b1bef8ad2322e6833f643473877b6.zip
* src/minibuf.c (history-length): Increase default from 30 to 100.
* lisp/cus-start.el (history-length): Bump :version. [Backport]
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/minibuf.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 39e94a85a0e..ec904da39bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-10-20 Glenn Morris <rgm@gnu.org>
2
3 * minibuf.c (history-length): Increase default from 30 to 100.
4 [Backport]
5
12014-10-20 Stefan Monnier <monnier@iro.umontreal.ca> 62014-10-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * xdisp.c (redisplay_window): Re-run pre-redisplay-function after we 8 * xdisp.c (redisplay_window): Re-run pre-redisplay-function after we
@@ -52,8 +57,7 @@
52 array of 2 values specifying the coordinates of the frame's 57 array of 2 values specifying the coordinates of the frame's
53 top-left corner. Use these values instead of calling x_get_arg, 58 top-left corner. Use these values instead of calling x_get_arg,
54 which can cons Lisp objects, and therefore cannot be called except 59 which can cons Lisp objects, and therefore cannot be called except
55 from the main thread. Remove redundant tests for the default 60 from the main thread. Remove redundant tests for the default values.
56 values.
57 (my_create_window): Move the calculation of the coordinates of the 61 (my_create_window): Move the calculation of the coordinates of the
58 frame's top-left edge here. Pass them to the input thread via the 62 frame's top-left edge here. Pass them to the input thread via the
59 second parameter of the WM_EMACS_CREATEWINDOW message. 63 second parameter of the WM_EMACS_CREATEWINDOW message.
diff --git a/src/minibuf.c b/src/minibuf.c
index c3fcbeb59c7..3042b13b7d6 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1970,7 +1970,7 @@ A value of t means no truncation.
1970This variable only affects history lists that don't specify their own 1970This variable only affects history lists that don't specify their own
1971maximum lengths. Setting the `history-length' property of a history 1971maximum lengths. Setting the `history-length' property of a history
1972variable overrides this default. */); 1972variable overrides this default. */);
1973 XSETFASTINT (Vhistory_length, 30); 1973 XSETFASTINT (Vhistory_length, 100);
1974 1974
1975 DEFVAR_BOOL ("history-delete-duplicates", history_delete_duplicates, 1975 DEFVAR_BOOL ("history-delete-duplicates", history_delete_duplicates,
1976 doc: /* Non-nil means to delete duplicates in history. 1976 doc: /* Non-nil means to delete duplicates in history.