aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-07-05 23:16:19 -0700
committerPaul Eggert2015-07-05 23:17:48 -0700
commit8c81ac97fdd0d1dff7256dace45bdd48324a0963 (patch)
tree606614100aadda2538ca7403f8b1558299a08434
parentf3400f4ca62ff03071c943bd31ff622eac90332c (diff)
downloademacs-8c81ac97fdd0d1dff7256dace45bdd48324a0963.tar.gz
emacs-8c81ac97fdd0d1dff7256dace45bdd48324a0963.zip
; Spelling fixes
-rw-r--r--lisp/menu-bar.el2
-rw-r--r--src/ChangeLog.132
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 72c05fe5e96..6a2ff630698 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -741,7 +741,7 @@ by \"Save Options\" in Custom buffers.")
741 741
742;; For the radio buttons below we check whether the respective dividers 742;; For the radio buttons below we check whether the respective dividers
743;; are displayed on the selected frame. This is not fully congruent 743;; are displayed on the selected frame. This is not fully congruent
744;; with `window-divder-mode' but makes the menu entries work also when 744;; with `window-divider-mode' but makes the menu entries work also when
745;; dividers are displayed by manipulating frame parameters directly. 745;; dividers are displayed by manipulating frame parameters directly.
746(defvar menu-bar-showhide-window-divider-menu 746(defvar menu-bar-showhide-window-divider-menu
747 (let ((menu (make-sparse-keymap "Window Divider"))) 747 (let ((menu (make-sparse-keymap "Window Divider")))
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index 328f7982e6b..196bd8e0d6d 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -10152,7 +10152,7 @@
10152 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS) 10152 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS)
10153 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros. 10153 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros.
10154 (FRAME_TOTAL_COLS_ARG): Remove macro. 10154 (FRAME_TOTAL_COLS_ARG): Remove macro.
10155 * fringe.c (draw_fringe_bitmap_1): Handle right divder. 10155 * fringe.c (draw_fringe_bitmap_1): Handle right divider.
10156 * gtkutil.c (xg_frame_resized, xg_frame_set_char_size) 10156 * gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
10157 (x_wm_set_size_hint): Handle frame pixel sizes. 10157 (x_wm_set_size_hint): Handle frame pixel sizes.
10158 * indent.c (compute_motion, Fcompute_motion): 10158 * indent.c (compute_motion, Fcompute_motion):