Merge from emacs-23
authorGlenn Morris <rgm@gnu.org>
Sat, 22 Jan 2011 19:36:45 +0000 (11:36 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 22 Jan 2011 19:36:45 +0000 (11:36 -0800)
1  2 
lisp/ChangeLog
lisp/comint.el
lisp/emacs-lisp/checkdoc.el
lisp/emacs-lisp/re-builder.el
lisp/progmodes/compile.el
lisp/progmodes/js.el
lisp/subr.el
src/ChangeLog
src/window.c

diff --cc lisp/ChangeLog
 -2011-01-21  Roland McGrath  <roland@frob.com>
+ 2011-01-22  Chong Yidong  <cyd@stupidchicken.com>
+       * emacs-lisp/re-builder.el (reb-mode-map): Fix logic error in
+       "Case sensitive" menu item.
 -2011-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
++2011-01-22  Roland McGrath  <roland@frob.com>
+       * comint.el (comint-replace-by-expanded-history-before-point): Fix
+       expansion of !$ and !!:N syntax to pick the indicated word (bug#7883).
 -2011-01-21  Jari Aalto  <jari.aalto@cante.net>
++2011-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/js.el (js--regexp-literal): Count backslashes (bug#7882).
 -2011-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
++2011-01-22  Jari Aalto  <jari.aalto@cante.net>
+       * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+       Assume foo(bar) is a manpage reference rather than some unquoted
+       symbol (bug#7705).
 -2011-01-21  Glenn Morris  <rgm@gnu.org>
++2011-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * subr.el (shell-quote-argument): Properly quote \n (bug#7687).
+       Suggested by Flo <sensorflo@gmail.com>.
 -2011-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
++2011-01-22  Glenn Morris  <rgm@gnu.org>
+       * progmodes/compile.el (compilation-error-regexp-alist):
+       Fix custom type.  (Bug#7812)
 +2011-01-22  Ken Manheimer  <ken.manheimer@gmail.com>
 +
 +      * allout.el (allout-prefixed-keybindings): Bind (prefixed) '#' to
 +      allout-number-siblings, in keeping with what obtained due to
 +      (now-defunct) allout-keybindings-list.  Ditch repeat binding to
 +      (prefixed) ?i.
 +      (allout-before-change-handler): Better expose spots affected by
 +      undo.
 +
 +2011-01-22  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * man.el (Man-highlight-references0): Use make-button (Bug#7881).
 +
 +2011-01-22  Phil Hagelberg  <phil@evri.com>
 +
 +      * pcmpl-unix.el (pcmpl-ssh-config-file): New option.
 +      (pcmpl-ssh-known-hosts): Rename from pcmpl-ssh-hosts.
 +      (pcmpl-ssh-config-hosts): New function.
 +      (pcmpl-ssh-hosts): Use pcmpl-ssh-config-hosts in addition to
 +      pcmpl-ssh-known-hosts.
 +
 +2011-01-21  Jay Belanger  <jay.p.belanger@gmail.com>
 +
 +      * calc/calc-undo.el (calc-undo): Autoload it.
 +      * calc/calc-ext.el (calc-init-extensions): Remove keybindings
 +      and autoload for `calc-undo'.
 +      * calc/calc.el (calc-mode-map): Add keybindings for `calc-undo'.
 +      * calc/calc-prog.el:
 +      * calc/calc-graph.el:
 +      * calc/calc-map.el: Change `arglist' to `math-arglist' throughout.
 +
 +2011-01-21  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
 +
 +      * calc/calc-ext.el (calc-init-extensions): Map all `undo'
 +      keybindings to `calc-undo'.
 +
 +2011-01-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      Don't mess with *temp*.
 +      * obsolete/spell.el: Move from textmodes/spell.el.
 +      (spell-string):
 +      * term.el (term-read-input-ring):
 +      * startup.el (display-startup-echo-area-message):
 +      * progmodes/antlr-mode.el (antlr-directory-dependencies):
 +      * comint.el (comint-read-input-ring): Use with-temp-buffer.
 +      * international/mule.el (ctext-pre-write-conversion): Don't hardcode
 +      point-min==1.
 +
 +2011-01-20  Ken Manheimer  <ken.manheimer@gmail.com>
 +
 +      * allout.el: (allout-institute-keymap): Use fset instead of
 +      reapplying defalias.
 +
 +      (allout-hotspot-key-handler): Check for non-control-modified
 +      bindings for hotspot characters if there are no control-modified
 +      versions.
 +
 +      * allout.el: Summary - migrate to defining allout mode using
 +      define-minor-mode instead of defun.  Significantly clean-up
 +      internal keymap provisions, refactoring and, in the process,
 +      removing a lot of accumulated cruft.
 +
 +      allout-mode-map is now a keymap by virtue of being a defalias to
 +      allout-mode-map-value, which contains the actual keymap structure.
 +
 +      (allout-mode): Use define-minor-mode rather than defun.
 +      Remove now-unnecessary minor-mode setup activities from the body.
 +      Specify :keymap as allout-mode-map so the minor-mode-map-alist
 +      entry will be '(allout-mode . allout-mode-map) - see
 +      allout-mode-map-value, below.  Adjust docstring to track changes.
 +      (allout-minor-mode): Remove this defalias, now that we're using
 +      define-minor-mode.
 +      (allout-mode-map): Set value to be 'allout-mode-map.  The actual
 +      keymap is allout-mode-map-value, via defalias.
 +      (allout-mode-map-value): The variable holding the actual mode
 +      keymap structure, by virtue of defalias from allout-mode-map.
 +      (allout-compose-and-institute-keymap): Rename from
 +      allout-bind-keys, and including the binding-composition
 +      functionality of the former produce-allout-mode-map and
 +      allout-setup-mode-map.
 +      (allout-institute-keymap): Take over the "setup" part of the former
 +      allout-setup-mode-map.  Reassign allout-mode-map-value value and
 +      update the defalias.
 +      (allout-command-prefix) (allout-prefixed-keybindings)
 +      (allout-unprefixed-keybindings):
 +      Use allout-compose-and-institute-keymap to process the bindings.
 +      (allout-unprefixed-keybindings): Remove extraneous '?' question
 +      marks.
 +      (allout-prefixed-keybindings): Elide binding to (prefixed) \C-h -
 +      user can customize if they want to use that binding.
 +      Bind allout-copy-topic-as-kill to (prefixed) \M-k.
 +      Bind allout-up-current-level to (prefixed) \C-u.  (I think i mistakenly
 +      elided that, previously, instead of the one for \C-h.)
 +      (allout-hotspot-key-handler): Remove attempt to resolve the key
 +      through the literal key-string lookup on allout-keybindings-list.
 +      That probably hasn't worked for a Long Time, and removal of
 +      allout-keybindings-list further simplifies the keybindings
 +      situation.
 +      (allout-pre-command-business): Use allout-mode-map-value instead
 +      of allout-mode-map.
 +      (allout-preempt-trailing-ctrl-h): Remove.  The user can customize
 +      the bindings if they want to use a keybinding having a trailing
 +      \C-h.  No deprecation needed since this feature was never in a
 +      release.
 +      (allout-keybindings-list): Remove.  It's not been useful for a
 +      while.  (See allout-hotspot-key-handler changes, above.)
 +      (produce-allout-mode-map): Remove.  Consolidate into
 +      allout-compose-and-institute-keymap.
 +      (allout-mode-map-adjustments): Remove.  No longer necessary with
 +      removal of allout-preempt-trailing-ctrl-h.
 +      (allout-setup-mode-map): Remove.  Consolidate into
 +      allout-compose-and-institute-keymap and allout-institute-keymap.
 +
 +2011-01-20  Glenn Morris  <rgm@gnu.org>
 +
 +      * vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.
 +
 +      * simple.el (read-expression-history): Remove, it's in minibuf.c.
 +
 +2011-01-20  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS.
 +
 +      * files.el (find-alternate-file, basic-save-buffer)
 +      (basic-save-buffer-2, revert-buffer, recover-file)
 +      (kill-buffer-ask, abort-if-file-too-large)
 +      (set-visited-file-name, write-file, backup-buffer)
 +      (basic-save-buffer, save-some-buffers):
 +      * dired-aux.el (dired-compress-file): Callers changed.
 +
 +2011-01-19  Glenn Morris  <rgm@gnu.org>
 +
 +      * vc/vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
 +      Also check the property status.  (Bug#7861)
 +
 +2011-01-18  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp.el (tramp-debug-message): Extend function exclude
 +      list.  Use `regexp-opt'.
 +
 +2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * textmodes/tex-mode.el (tex-font-lock-verb): Make sure \verb
 +      highlighting doesn't spill over subsequent lines.
  
        * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the
        keymap expression.  Improve docstring.
diff --cc lisp/comint.el
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1657,19 -1653,18 +1657,18 @@@ This performs fontification according t
  ;; XXX: Javascript can continue a regexp literal across lines so long
  ;; as the newline is escaped with \. Account for that in the regexp
  ;; below.
 -(defconst js--regexp-literal
 -  "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)"
 +(eval-and-compile
 +  (defconst js--regexp-literal
-   "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\/\\|[^/*]\\)\\(?:\\\\/\\|[^/]\\)*\\(/\\)"
++    "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)"
    "Regexp matching a JavaScript regular expression literal.
  Match groups 1 and 2 are the characters forming the beginning and
 -end of the literal.")
 +end of the literal."))
  
 -;; we want to match regular expressions only at the beginning of
 -;; expressions
 -(defconst js-font-lock-syntactic-keywords
 -  `((,js--regexp-literal (1 "|") (2 "|")))
 -  "Syntactic font lock keywords matching regexps in JavaScript.
 -See `font-lock-keywords'.")
 +(defconst js-syntax-propertize-function
 +  (syntax-propertize-rules
 +   ;; We want to match regular expressions only at the beginning of
 +   ;; expressions.
 +   (js--regexp-literal (1 "\"") (2 "\""))))
  
  ;;; Indentation
  
diff --cc lisp/subr.el
Simple merge
diff --cc src/ChangeLog
 -2011-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 2011-01-22  Martin Rudalics  <rudalics@gmx.at>
+       * window.c (select_window): New function.
+       (Fselect_window): Call it.
+       (inhibit_point_swap): Variable deleted.
+       (Fset_window_configuration): Call select_window directly.
 +2011-01-22  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * nsterm.m (constrainFrameRect): Only constrain the first time called.
 +
 +2011-01-21  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * nsterm.m (x_set_offset, windowDidMove): When calculating y, use first
 +      screen, not the window screen.
 +      (x_set_window_size): Remove constraints.
 +      Calculate origin.y only if zooming is 0 and without referring to a
 +      screen.
 +      (windowWillResize): Don't modify frameSize.
 +      (windowDidBecomeKey, mouseDown): Set dont_constrain to 1.
 +      (initFrameFromEmacs): Initialize ns_userRect.
 +      (windowShouldZoom): Set zooming to one.  Remove all other code.
 +      (windowWillUseStandardFrame): Move static ns_userRect to EmacsView.
 +      Zero it after restore.
 +      (constrainFrameRect): New method for EmacsWindow.
 +      (mouseDragged): Always post NSWindowDidResizeNotification after call to
 +      windowWillResize.
 +
 +      * nsterm.h (ns_output): Add dont_constrain and zooming.
 +      (EmacsView): Add ns_userRect.
 +
 +      * nsterm.m (keyDown): If ns_right_alternate_modifier is Qleft, check
 +      if ns_alternate_modifier is none.
 +
 +2011-01-20  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * unexmacosx.c: Add comment about include order.
 +
 +2011-01-20  Glenn Morris  <rgm@gnu.org>
 +
 +      * minibuf.c (syms_of_minibuf) <read-expression-history>:
 +      Give it a doc string.
 +      * globals.h: Add Vread_expression_history.
 +
 +      * macros.c (syms_of_macros) <kbd-macro-termination-hook>:
 +      Give it a doc string.
 +      * globals.h: Add Vkbd_macro_termination_hook.
 +
 +2011-01-20  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS.
 +
 +2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Fix X11 compilation failure.
 +      * globals.h (struct emacs_globals): Document f_Vselection_alist.
 +      * xselect.c (Vselection_alist): Remove declaration, moving its
 +      documentation to globals.h.  This fixes a compilation failure
 +      induced by the earlier change to globals.h today.
 +
 +2011-01-19  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * unexmacosx.c: Include config.h before unistd.h (Bug#7859).
 +
 +      * nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
 +      (ns_input_line, ns_input_color, ns_input_text, ns_working_text)
 +      (ns_input_spi_name, ns_input_spi_arg)
 +      (ns_alternate_modifier, ns_right_alternate_modifier)
 +      (ns_command_modifier, ns_right_command_modifier, ns_control_modifier)
 +      (ns_right_control_modifier, ns_function_modifier)
 +      (ns_antialias_text, ns_confirm_quit): Move to globals.h.
 +      (Vx_toolkit_scroll_bars, x_use_underline_position_properties)
 +      (x_underline_at_descent_line): Remove declaration.
 +      (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.
 +
 +      * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
 +      (Vselection_alist, Vselection_converter_alist): Move to globals.h.
 +      (syms_of_nsselect): Remove & from DEFVAR_LISP.
 +
 +      * nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag):
 +      Remove declaration.
 +
 +      * nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to
 +      globals.h.
 +      (syms_of_nsfont): Remove & from DEFVAR_LISP.
 +
 +      * nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration.
 +      (Vns_icon_type_alist, Vns_version_string): Move to globals.h.
 +      (syms_of_nsfns): Remove & from DEFVAR_LISP calls.
 +
 +      * globals.h (struct emacs_globals): Add f_ns_input_file,
 +      f_ns_input_font, f_ns_input_fontsize, f_ns_input_line,
 +      f_ns_input_color, f_ns_input_text, f_ns_working_text,
 +      f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier,
 +      f_ns_right_alternate_modifier, f_ns_command_modifier,
 +      f_ns_right_command_modifier, f_ns_control_modifier,
 +      f_ns_right_control_modifier, f_ns_function_modifier,
 +      f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist,
 +      f_Vns_version_string, f_Vns_sent_selection_hooks,
 +      f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script
 +      and corresponding defines.
 +
 +
 +2011-01-19  Sam Steingold  <sds@gnu.org>
 +
 +      * w32.c (check_windows_init_file): Remove declarations of
 +      Vwindow_system, Vload_path, Qfile_exists_p to fix compilation.
 +      * w32fns.c: Fix an error introduced by the previous patch.
 +
 +2011-01-19  Tom Tromey  <tromey@redhat.com>
 +
 +      * window.c: Fix error introduced by previous patch.
 +
 +2011-01-18  Tom Tromey  <tromey@parfait>
 +
 +      * globals.h: New file.
 +      * xterm.h (Vx_pixel_size_width_font_regexp): Remove declaration.
 +      * window.h (Vinitial_window_system, Vminibuf_scroll_window)
 +      (Vwindow_system_version): Remove declaration.
 +      * w32term.h (Vw32_enable_palette)
 +      (Vx_pixel_size_width_font_regexp): Remove declaration.
 +      * w32menu.c (Voverriding_local_map)
 +      (Voverriding_local_map_menu_flag): Remove declaration.
 +      * w32inevt.c (Vw32_alt_is_meta, Vw32_apps_modifier)
 +      (Vw32_capslock_is_shiftlock, Vw32_enable_caps_lock)
 +      (Vw32_enable_num_lock, Vw32_lwindow_modifier)
 +      (Vw32_pass_lwindow_to_system, Vw32_pass_rwindow_to_system)
 +      (Vw32_phantom_key_code, Vw32_recognize_altgr)
 +      (Vw32_rwindow_modifier, Vw32_scroll_lock_modifier)
 +      (w32_use_full_screen_buffer): Remove declaration.
 +      * w32.c (Vsystem_configuration, Vw32_downcase_file_names)
 +      (Vw32_generate_fake_inodes, Vw32_get_true_file_attributes)
 +      (w32_num_mouse_buttons, w32_pipe_read_delay): Remove declaration.
 +      * termopts.h (Vtruncate_partial_width_windows, inverse_video)
 +      (no_redraw_on_reenter, visible_bell): Remove declaration.
 +      * sysdep.c (Vsystem_name): Remove declaration.
 +      * syntax.h (parse_sexp_lookup_properties): Remove declaration.
 +      * menu.h (Vmenu_updating_frame): Remove declaration.
 +      * macros.h (Vexecuting_kbd_macro, executing_kbd_macro_index):
 +      Remove declaration.
 +      * lisp.h (Vafter_init_time, Vafter_load_alist)
 +      (Vauto_save_list_file_name, Vbefore_init_time, Vcommand_history)
 +      (Vcompletion_regexp_list, Vcurrent_load_list)
 +      (Vcurrent_prefix_arg, Vdata_directory, Vdebug_on_error)
 +      (Vdoc_directory, Vdoc_file_name, Vdynamic_library_alist)
 +      (Vexec_directory, Vexec_path, Vexec_suffixes)
 +      (Vface_font_rescale_alist, Vface_ignored_fonts, Vfeatures)
 +      (Vhelp_form, Vhistory_length, Vinhibit_field_text_motion)
 +      (Vinhibit_quit, Vinhibit_read_only, Vinhibit_redisplay)
 +      (Vinstallation_directory, Vinvocation_directory)
 +      (Vinvocation_name, Vload_file_rep_suffixes, Vload_history)
 +      (Vload_suffixes, Vmark_even_if_inactive, Vmemory_full)
 +      (Vmessage_log_max, Vobarray, Vprint_length, Vprint_level)
 +      (Vpurify_flag, Vquit_flag, Vsaved_region_selection)
 +      (Vscalable_fonts_allowed, Vselect_active_regions)
 +      (Vshell_file_name, Vstandard_input, Vstandard_output)
 +      (Vsystem_name, Vtemporary_file_directory, Vthrow_on_input)
 +      (Vtop_level, Vtty_erase_char, Vundo_outer_limit)
 +      (Vuser_login_name, Vwindow_scroll_functions)
 +      (Vwindow_system_version, Vx_no_window_manager)
 +      (Vx_resource_class, Vx_resource_name, baud_rate)
 +      (completion_ignore_case, debug_on_next_call, gc_cons_threshold)
 +      (history_delete_duplicates, inhibit_x_resources)
 +      (last_nonmenu_event, load_in_progress, max_specpdl_size)
 +      (minibuffer_auto_raise, print_escape_newlines, scroll_margin)
 +      (use_dialog_box, use_file_dialog): Remove declaration.  Include
 +      globals.h.
 +      * keymap.h (Voverriding_local_map)
 +      (Voverriding_local_map_menu_flag, meta_prefix_char): Remove
 +      declaration.
 +      * keyboard.h (Vdouble_click_time, Vfunction_key_map)
 +      (Vinput_method_function, Vkey_translation_map)
 +      (Vlucid_menu_bar_dirty_flag, Vthis_original_command)
 +      (do_mouse_tracking, extra_keyboard_modifiers)
 +      (num_nonmacro_input_events): Remove declaration.
 +      * intervals.h (Vchar_property_alias_alist)
 +      (Vdefault_text_properties, Vinhibit_point_motion_hooks)
 +      (Vtext_property_default_nonsticky): Remove declaration.
 +      * gtkutil.h (x_gtk_file_dialog_help_text)
 +      (x_gtk_show_hidden_files, x_gtk_use_old_file_dialog)
 +      (x_gtk_whole_detached_tool_bar): Remove declaration.
 +      * frame.h (Vdefault_frame_alist, Vframe_alpha_lower_limit)
 +      (Vmenu_bar_mode, Vmouse_highlight, Vterminal_frame)
 +      (Vtool_bar_mode, Vx_resource_class, Vx_resource_name)
 +      (focus_follows_mouse): Remove declaration.
 +      * fontset.h (Valternate_fontname_alist, Vfontset_alias_alist)
 +      (Vignore_relative_composition, Votf_script_alist)
 +      (Vuse_default_ascent, Vvertical_centering_font_regexp): Remove
 +      declaration.
 +      * font.h (Vfont_log): Remove declaration.
 +      * dosfns.h (Vdos_display_scancodes, Vdos_version)
 +      (Vdos_windows_version, dos_codepage, dos_country_code)
 +      (dos_decimal_point, dos_hyper_key, dos_keyboard_layout)
 +      (dos_keypad_mode, dos_super_key, dos_timezone_offset): Remove
 +      declaration.
 +      * disptab.h (Vglyph_table, Vstandard_display_table): Remove
 +      declaration.
 +      * dispextern.h (Vface_remapping_alist, Vglyphless_char_display)
 +      (Vmouse_autoselect_window, Voverflow_newline_into_fringe)
 +      (Vshow_trailing_whitespace, Vtool_bar_button_margin)
 +      (Vtool_bar_style, cursor_in_echo_area, display_hourglass_p)
 +      (inverse_video, mode_line_in_non_selected_windows)
 +      (tool_bar_button_relief, tool_bar_max_label_size)
 +      (underline_minimum_offset)
 +      (unibyte_display_via_language_environment, x_stretch_cursor_p):
 +      Remove declaration.
 +      * composite.h (Vauto_composition_function)
 +      (Vcomposition_function_table): Remove declaration.
 +      * commands.h (Vexecuting_kbd_macro)
 +      (Vminibuffer_local_completion_map)
 +      (Vminibuffer_local_filename_completion_map)
 +      (Vminibuffer_local_filename_must_match_map)
 +      (Vminibuffer_local_map, Vminibuffer_local_must_match_map)
 +      (Vminibuffer_local_ns_map, Vthis_command)
 +      (Vunread_command_events, cursor_in_echo_area)
 +      (last_command_event, last_nonmenu_event, unread_command_char):
 +      Remove declaration.
 +      * coding.h (Vcoding_system_for_read, Vcoding_system_for_write)
 +      (Vdefault_file_name_coding_system)
 +      (Vdefault_process_coding_system, Vfile_name_coding_system)
 +      (Vlast_coding_system_used, Vlocale_coding_system)
 +      (Vselect_safe_coding_system_function)
 +      (Vtranslation_table_for_input, coding_system_require_warning)
 +      (eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided)
 +      (eol_mnemonic_unix, inherit_process_coding_system): Remove
 +      declaration.
 +      * charset.h (Vcharset_list, Vcurrent_iso639_language): Remove
 +      declaration.
 +      * character.h (Vauto_fill_chars, Vchar_direction_table)
 +      (Vchar_script_table, Vchar_width_table, Vprintable_chars)
 +      (Vscript_representative_chars, Vtranslation_table_vector)
 +      (Vunicode_category_table): Remove declaration.
 +      * ccl.h (Vfont_ccl_encoder_alist): Remove declaration.
 +      * buffer.h (Vafter_change_functions, Vbefore_change_functions)
 +      (Vdeactivate_mark, Vfirst_change_hook, Vtransient_mark_mode)
 +      (inhibit_modification_hooks): Remove declaration.
 +      * xterm.c (syms_of_xterm): Update.
 +      (Vx_alt_keysym, Vx_hyper_keysym, Vx_keysym_table)
 +      (Vx_meta_keysym, Vx_super_keysym, Vx_toolkit_scroll_bars)
 +      (x_mouse_click_focus_ignore_position)
 +      (x_underline_at_descent_line)
 +      (x_use_underline_position_properties): Remove.
 +      * xsmfns.c (syms_of_xsmfns): Update.
 +      (Vx_session_id, Vx_session_previous_id): Remove.
 +      * xsettings.c (syms_of_xsettings): Update.
 +      (Vxft_settings, use_system_font): Remove.
 +      * xselect.c (syms_of_xselect): Update.
 +      (Vselection_converter_alist, Vx_lost_selection_functions)
 +      (Vx_sent_selection_functions, x_selection_timeout): Remove.
 +      * xfns.c (syms_of_xfns): Update.
 +      (Vgtk_version_string, Vmotif_version_string)
 +      (Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape)
 +      (Vx_max_tooltip_size, Vx_mode_pointer_shape)
 +      (Vx_no_window_manager, Vx_nontext_pointer_shape)
 +      (Vx_pixel_size_width_font_regexp, Vx_pointer_shape)
 +      (Vx_sensitive_text_pointer_shape)
 +      (Vx_window_horizontal_drag_shape, x_gtk_file_dialog_help_text)
 +      (x_gtk_show_hidden_files, x_gtk_use_old_file_dialog)
 +      (x_gtk_use_system_tooltips, x_gtk_whole_detached_tool_bar):
 +      Remove.
 +      * xfaces.c (syms_of_xfaces): Update.
 +      (Vface_default_stipple, Vface_font_rescale_alist)
 +      (Vface_ignored_fonts, Vface_new_frame_defaults)
 +      (Vface_remapping_alist, Vfont_list_limit)
 +      (Vscalable_fonts_allowed, Vtty_defined_color_alist): Remove.
 +      * xdisp.c (syms_of_xdisp): Update.
 +      (Vauto_resize_tool_bars, Vblink_cursor_alist)
 +      (Vdisplay_pixels_per_inch, Vfontification_functions)
 +      (Vframe_title_format, Vglobal_mode_string)
 +      (Vglyphless_char_display, Vhourglass_delay, Vhscroll_step)
 +      (Vicon_title_format, Vinhibit_redisplay)
 +      (Vline_number_display_limit, Vline_prefix)
 +      (Vmax_mini_window_height, Vmenu_bar_update_hook)
 +      (Vmenu_updating_frame, Vmessage_log_max)
 +      (Vmouse_autoselect_window, Vnobreak_char_display)
 +      (Voverlay_arrow_position, Voverlay_arrow_string)
 +      (Voverlay_arrow_variable_list, Vredisplay_end_trigger_functions)
 +      (Vresize_mini_windows, Vshow_trailing_whitespace)
 +      (Vtool_bar_border, Vtool_bar_button_margin, Vtool_bar_style)
 +      (Vtruncate_partial_width_windows, Vvoid_text_area_pointer)
 +      (Vwindow_scroll_functions, Vwindow_size_change_functions)
 +      (Vwindow_text_change_functions, Vwrap_prefix)
 +      (auto_raise_tool_bar_buttons_p, automatic_hscrolling_p)
 +      (debug_end_pos, display_hourglass_p, emacs_scroll_step)
 +      (highlight_nonselected_windows, hscroll_margin)
 +      (inhibit_eval_during_redisplay, inhibit_free_realized_faces)
 +      (inhibit_menubar_update, inhibit_try_cursor_movement)
 +      (inhibit_try_window_id, inhibit_try_window_reusing)
 +      (line_number_display_limit_width)
 +      (make_cursor_line_fully_visible_p, message_truncate_lines)
 +      (mode_line_inverse_video, multiple_frames, overline_margin)
 +      (scroll_conservatively, scroll_margin, tool_bar_button_relief)
 +      (tool_bar_max_label_size, underline_minimum_offset)
 +      (unibyte_display_via_language_environment, x_stretch_cursor_p):
 +      Remove.
 +      * window.c (syms_of_window): Update.
 +      (Vminibuf_scroll_window, Vother_window_scroll_buffer)
 +      (Vrecenter_redisplay, Vscroll_preserve_screen_position)
 +      (Vtemp_buffer_show_function, Vwindow_configuration_change_hook)
 +      (Vwindow_point_insertion_type, auto_window_vscroll_p)
 +      (mode_line_in_non_selected_windows, next_screen_context_lines)
 +      (window_min_height, window_min_width): Remove.
 +      (scroll_margin): Remove declaration.
 +      * w32term.c (syms_of_w32term): Update.
 +      (Vw32_capslock_is_shiftlock, Vw32_grab_focus_on_raise)
 +      (Vw32_recognize_altgr, Vw32_swap_mouse_buttons)
 +      (Vx_toolkit_scroll_bars, w32_num_mouse_buttons)
 +      (w32_use_visible_system_caret, x_underline_at_descent_line)
 +      (x_use_underline_position_properties): Remove.
 +      (Vcommand_line_args, Vsystem_name, extra_keyboard_modifiers):
 +      Remove declaration.
 +      * w32select.c (syms_of_w32select): Update.
 +      (Vnext_selection_coding_system, Vselection_coding_system): Remove.
 +      * w32proc.c (syms_of_ntproc): Update.
 +      (Vw32_downcase_file_names, Vw32_generate_fake_inodes)
 +      (Vw32_get_true_file_attributes, Vw32_quote_process_args)
 +      (Vw32_start_process_inherit_error_mode)
 +      (Vw32_start_process_share_console)
 +      (Vw32_start_process_show_window, w32_pipe_read_delay): Remove.
 +      (Vsystem_name): Remove declaration.
 +      * w32font.c (syms_of_w32font): Update.
 +      (Vw32_charset_info_alist): Remove.
 +      * w32fns.c (globals_of_w32fns, syms_of_w32fns): Update.
 +      (Vw32_alt_is_meta, Vw32_apps_modifier, Vw32_bdf_filename_alist)
 +      (Vw32_color_map, Vw32_enable_caps_lock, Vw32_enable_num_lock)
 +      (Vw32_enable_palette, Vw32_lwindow_modifier)
 +      (Vw32_pass_alt_to_system, Vw32_pass_lwindow_to_system)
 +      (Vw32_pass_rwindow_to_system, Vw32_phantom_key_code)
 +      (Vw32_rwindow_modifier, Vw32_scroll_lock_modifier)
 +      (Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape)
 +      (Vx_max_tooltip_size, Vx_mode_pointer_shape)
 +      (Vx_no_window_manager, Vx_nontext_pointer_shape)
 +      (Vx_pixel_size_width_font_regexp, Vx_pointer_shape)
 +      (Vx_sensitive_text_pointer_shape)
 +      (Vx_window_horizontal_drag_shape, w32_ansi_code_page)
 +      (w32_enable_synthesized_fonts, w32_mouse_button_tolerance)
 +      (w32_mouse_move_interval)
 +      (w32_pass_extra_mouse_buttons_to_system)
 +      (w32_pass_multimedia_buttons_to_system, w32_quit_key)
 +      (w32_strict_fontnames, w32_strict_painting): Remove.
 +      (Vhourglass_delay, Vmenu_bar_mode, Vtool_bar_mode)
 +      (Vw32_recognize_altgr, Vwindow_system_version)
 +      (w32_num_mouse_buttons, w32_use_visible_system_caret): Remove
 +      declaration.
 +      * w32console.c (syms_of_ntterm): Update.
 +      (w32_use_full_screen_buffer): Remove.
 +      (Vtty_defined_color_alist): Remove declaration.
 +      * w16select.c (syms_of_win16select): Update.
 +      (Vnext_selection_coding_system, Vselection_coding_system): Remove.
 +      * undo.c (syms_of_undo): Update.
 +      (Vundo_outer_limit, Vundo_outer_limit_function)
 +      (undo_inhibit_record_point, undo_limit, undo_strong_limit):
 +      Remove.
 +      * textprop.c (syms_of_textprop): Update.
 +      (Vchar_property_alias_alist, Vdefault_text_properties)
 +      (Vinhibit_point_motion_hooks, Vtext_property_default_nonsticky):
 +      Remove.
 +      * terminal.c (syms_of_terminal): Update.
 +      (Vdelete_terminal_functions, Vring_bell_function): Remove.
 +      * term.c (syms_of_term): Update.
 +      (Vresume_tty_functions, Vsuspend_tty_functions)
 +      (no_redraw_on_reenter, system_uses_terminfo, visible_cursor):
 +      Remove.
 +      * syntax.c (syms_of_syntax): Update.
 +      (Vfind_word_boundary_function_table, multibyte_syntax_as_symbol)
 +      (open_paren_in_column_0_is_defun_start)
 +      (parse_sexp_ignore_comments, parse_sexp_lookup_properties)
 +      (words_include_escapes): Remove.
 +      * search.c (syms_of_search): Update.
 +      (Vinhibit_changing_match_data, Vsearch_spaces_regexp): Remove.
 +      * process.c (syms_of_process): Update.
 +      (Vprocess_adaptive_read_buffering, Vprocess_connection_type)
 +      (delete_exited_processes): Remove.
 +      * print.c (syms_of_print): Update.
 +      (Vfloat_output_format, Vprint_charset_text_property)
 +      (Vprint_circle, Vprint_continuous_numbering, Vprint_gensym)
 +      (Vprint_length, Vprint_level, Vprint_number_table)
 +      (Vstandard_output, print_escape_multibyte)
 +      (print_escape_newlines, print_escape_nonascii, print_quoted):
 +      Remove.
 +      * msdos.c (syms_of_msdos): Update.
 +      (Vdos_unsupported_char_glyph): Remove.
 +      (unibyte_display_via_language_environment): Remove declaration.
 +      * minibuf.c (syms_of_minibuf): Update.
 +      (Vcompletion_regexp_list, Vhistory_add_new_input)
 +      (Vhistory_length, Vminibuffer_completing_file_name)
 +      (Vminibuffer_completion_confirm)
 +      (Vminibuffer_completion_predicate, Vminibuffer_completion_table)
 +      (Vminibuffer_exit_hook, Vminibuffer_help_form)
 +      (Vminibuffer_history_position, Vminibuffer_history_variable)
 +      (Vminibuffer_prompt_properties, Vminibuffer_setup_hook)
 +      (Vread_buffer_function, Vread_expression_map)
 +      (completion_ignore_case, enable_recursive_minibuffers)
 +      (history_delete_duplicates, minibuffer_allow_text_properties)
 +      (minibuffer_auto_raise, read_buffer_completion_ignore_case):
 +      Remove.
 +      * marker.c (syms_of_marker): Update.
 +      (byte_debug_flag): Remove.
 +      * macros.c (syms_of_macros): Update.
 +      (Vexecuting_kbd_macro, executing_kbd_macro_index): Remove.
 +      * lread.c (syms_of_lread): Update.
 +      (Vafter_load_alist, Vbyte_boolean_vars)
 +      (Vbytecomp_version_regexp, Vcurrent_load_list)
 +      (Veval_buffer_list, Vload_file_name, Vload_file_rep_suffixes)
 +      (Vload_history, Vload_path, Vload_read_function)
 +      (Vload_source_file_function, Vload_suffixes, Vobarray)
 +      (Vold_style_backquotes, Vpreloaded_file_list, Vread_circle)
 +      (Vread_symbol_positions_list, Vread_with_symbol_positions)
 +      (Vsource_directory, Vstandard_input, Vuser_init_file, Vvalues)
 +      (force_load_messages, load_convert_to_unibyte)
 +      (load_dangerous_libraries, load_force_doc_strings)
 +      (load_in_progress): Remove.
 +      * keymap.c (syms_of_keymap): Update.
 +      (Vdefine_key_rebound_commands, Vemulation_mode_map_alists)
 +      (Vminibuffer_local_completion_map)
 +      (Vminibuffer_local_filename_completion_map)
 +      (Vminibuffer_local_filename_must_match_map)
 +      (Vminibuffer_local_map, Vminibuffer_local_must_match_map)
 +      (Vminibuffer_local_ns_map, Vminor_mode_map_alist)
 +      (Vminor_mode_overriding_map_alist, Vwhere_is_preferred_modifier):
 +      Remove.
 +      * keyboard.c (syms_of_keyboard): Update.
 +      (Vauto_save_timeout, Vcommand_error_function)
 +      (Vcommand_hook_internal, Vdeactivate_mark)
 +      (Vdeferred_action_function, Vdeferred_action_list)
 +      (Vdisable_point_adjustment, Vdouble_click_time)
 +      (Vecho_keystrokes, Venable_disabled_menus_and_buttons)
 +      (Vfunction_key_map, Vglobal_disable_point_adjustment)
 +      (Vhelp_char, Vhelp_event_list, Vhelp_form)
 +      (Vinput_method_function, Vinput_method_previous_message)
 +      (Vkey_translation_map, Vlast_event_frame)
 +      (Vlucid_menu_bar_dirty_flag, Vmenu_bar_final_items)
 +      (Vminibuffer_message_timeout, Voverriding_local_map)
 +      (Voverriding_local_map_menu_flag, Vpost_command_hook)
 +      (Vpre_command_hook, Vprefix_help_command)
 +      (Vsaved_region_selection, Vselect_active_regions)
 +      (Vshow_help_function, Vspecial_event_map, Vsuggest_key_bindings)
 +      (Vthis_command, Vthis_command_keys_shift_translated)
 +      (Vthis_original_command, Vthrow_on_input, Vtimer_idle_list)
 +      (Vtimer_list, Vtool_bar_separator_image_expression, Vtop_level)
 +      (Vtty_erase_char, Vunread_command_events)
 +      (Vunread_input_method_events, Vunread_post_input_method_events)
 +      (auto_save_interval, cannot_suspend, do_mouse_tracking)
 +      (double_click_fuzz, extra_keyboard_modifiers)
 +      (inhibit_local_menu_bar_menus, last_command_event)
 +      (last_input_event, last_nonmenu_event, menu_prompt_more_char)
 +      (menu_prompting, meta_prefix_char, num_input_keys)
 +      (num_nonmacro_input_events, polling_period, unread_command_char):
 +      Remove.
 +      * insdel.c (syms_of_insdel): Update.
 +      (Vcombine_after_change_calls, check_markers_debug_flag): Remove.
 +      * indent.c (syms_of_indent): Update.
 +      (indent_tabs_mode): Remove.
 +      * image.c (syms_of_image): Update.
 +      (Vimage_cache_eviction_delay, Vimage_types)
 +      (Vimagemagick_render_type, Vmax_image_size, Vx_bitmap_file_path)
 +      (cross_disabled_images): Remove.
 +      * fringe.c (syms_of_fringe): Update.
 +      (Vfringe_bitmaps, Voverflow_newline_into_fringe): Remove.
 +      * frame.c (syms_of_frame): Update.
 +      (Vdefault_frame_alist, Vdefault_frame_scroll_bars)
 +      (Vdelete_frame_functions, Vframe_alpha_lower_limit)
 +      (Vmake_pointer_invisible, Vmenu_bar_mode, Vmouse_highlight)
 +      (Vmouse_position_function, Vterminal_frame, Vtool_bar_mode)
 +      (Vx_resource_class, Vx_resource_name, focus_follows_mouse):
 +      Remove.
 +      * fontset.c (syms_of_fontset): Update.
 +      (Valternate_fontname_alist, Vfont_encoding_charset_alist)
 +      (Vfontset_alias_alist, Vignore_relative_composition)
 +      (Votf_script_alist, Vuse_default_ascent)
 +      (Vvertical_centering_font_regexp): Remove.
 +      * font.c (syms_of_font): Update.
 +      (Vfont_encoding_alist, Vfont_log, Vfont_slant_table)
 +      (Vfont_weight_table, Vfont_width_table): Remove.
 +      * fns.c (syms_of_fns): Update.
 +      (Vfeatures, use_dialog_box, use_file_dialog): Remove.
 +      * filelock.c (syms_of_filelock): Update.
 +      (Vtemporary_file_directory): Remove.
 +      * fileio.c (syms_of_fileio): Update.
 +      (Vafter_insert_file_functions, Vauto_save_include_big_deletions)
 +      (Vauto_save_list_file_name, Vauto_save_visited_file_name)
 +      (Vdefault_file_name_coding_system, Vfile_name_coding_system)
 +      (Vfile_name_handler_alist, Vinhibit_file_name_handlers)
 +      (Vinhibit_file_name_operation, Vset_auto_coding_function)
 +      (Vwrite_region_annotate_functions)
 +      (Vwrite_region_annotations_so_far)
 +      (Vwrite_region_post_annotation_function)
 +      (delete_by_moving_to_trash, write_region_inhibit_fsync): Remove.
 +      (Vw32_get_true_file_attributes): Remove declaration.
 +      * eval.c (syms_of_eval): Update.
 +      (Vdebug_ignored_errors, Vdebug_on_error, Vdebug_on_signal)
 +      (Vdebugger, Vinhibit_quit, Vmacro_declaration_function)
 +      (Vquit_flag, Vsignal_hook_function, Vstack_trace_on_error)
 +      (debug_on_next_call, debug_on_quit, debugger_may_continue)
 +      (max_lisp_eval_depth, max_specpdl_size): Remove.
 +      * emacs.c (syms_of_emacs): Update.
 +      (Vafter_init_time, Vbefore_init_time, Vcommand_line_args)
 +      (Vdynamic_library_alist, Vemacs_copyright, Vemacs_version)
 +      (Vinstallation_directory, Vinvocation_directory)
 +      (Vinvocation_name, Vkill_emacs_hook, Vpath_separator)
 +      (Vprevious_system_messages_locale, Vprevious_system_time_locale)
 +      (Vsystem_configuration, Vsystem_configuration_options)
 +      (Vsystem_messages_locale, Vsystem_time_locale, Vsystem_type)
 +      (inhibit_x_resources, noninteractive1): Remove.
 +      * editfns.c (syms_of_editfns): Update.
 +      (Vbuffer_access_fontified_property)
 +      (Vbuffer_access_fontify_functions, Vinhibit_field_text_motion)
 +      (Voperating_system_release, Vsystem_name, Vuser_full_name)
 +      (Vuser_login_name, Vuser_real_login_name): Remove.
 +      * dosfns.c (syms_of_dosfns): Update.
 +      (Vdos_display_scancodes, Vdos_version, Vdos_windows_version)
 +      (dos_codepage, dos_country_code, dos_decimal_point)
 +      (dos_hyper_key, dos_keyboard_layout, dos_keypad_mode)
 +      (dos_super_key, dos_timezone_offset): Remove.
 +      * doc.c (syms_of_doc): Update.
 +      (Vbuild_files, Vdoc_file_name): Remove.
 +      * dispnew.c (syms_of_display): Update.
 +      (Vglyph_table, Vinitial_window_system)
 +      (Vredisplay_preemption_period, Vstandard_display_table)
 +      (Vwindow_system_version, baud_rate, cursor_in_echo_area)
 +      (inverse_video, redisplay_dont_pause, visible_bell): Remove.
 +      * dired.c (syms_of_dired): Update.
 +      (Vcompletion_ignored_extensions): Remove.
 +      (Vw32_get_true_file_attributes): Remove declaration.
 +      * dbusbind.c (syms_of_dbusbind): Update.
 +      (Vdbus_debug, Vdbus_registered_buses)
 +      (Vdbus_registered_objects_table): Remove.
 +      * data.c (syms_of_data): Update.
 +      (Vmost_negative_fixnum, Vmost_positive_fixnum): Remove.
 +      * composite.c (syms_of_composite): Update.
 +      (Vauto_composition_function, Vauto_composition_mode)
 +      (Vcompose_chars_after_function, Vcomposition_function_table):
 +      Remove.
 +      * coding.c (syms_of_coding): Update.
 +      (Vcharset_revision_table, Vcoding_category_list)
 +      (Vcoding_system_alist, Vcoding_system_for_read)
 +      (Vcoding_system_for_write, Vcoding_system_list)
 +      (Vdefault_process_coding_system, Venable_character_translation)
 +      (Vfile_coding_system_alist, Vlast_code_conversion_error)
 +      (Vlast_coding_system_used, Vlatin_extra_code_table)
 +      (Vlocale_coding_system, Vnetwork_coding_system_alist)
 +      (Vprocess_coding_system_alist)
 +      (Vselect_safe_coding_system_function)
 +      (Vstandard_translation_table_for_decode)
 +      (Vstandard_translation_table_for_encode)
 +      (Vtranslation_table_for_input, coding_system_require_warning)
 +      (eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided)
 +      (eol_mnemonic_unix, inherit_process_coding_system)
 +      (inhibit_eol_conversion, inhibit_iso_escape_detection)
 +      (inhibit_null_byte_detection): Remove.
 +      * cmds.c (syms_of_cmds): Update.
 +      (Vpost_self_insert_hook): Remove.
 +      * charset.c (syms_of_charset): Update.
 +      (Vcharset_list, Vcharset_map_path, Vcurrent_iso639_language)
 +      (inhibit_load_charset_map): Remove.
 +      * character.c (syms_of_character): Update.
 +      (Vauto_fill_chars, Vchar_direction_table, Vchar_script_table)
 +      (Vchar_width_table, Vprintable_chars)
 +      (Vscript_representative_chars, Vtranslation_table_vector)
 +      (Vunicode_category_table): Remove.
 +      * ccl.c (syms_of_ccl): Update.
 +      (Vcode_conversion_map_vector, Vfont_ccl_encoder_alist)
 +      (Vtranslation_hash_table_vector): Remove.
 +      * category.c (syms_of_category): Update.
 +      (Vword_combining_categories, Vword_separating_categories): Remove.
 +      * callproc.c (syms_of_callproc): Update.
 +      (Vconfigure_info_directory, Vdata_directory, Vdoc_directory)
 +      (Vexec_directory, Vexec_path, Vexec_suffixes)
 +      (Vinitial_environment, Vprocess_environment)
 +      (Vshared_game_score_directory, Vshell_file_name): Remove.
 +      * callint.c (syms_of_callint): Update.
 +      (Vcommand_debug_status, Vcommand_history, Vcurrent_prefix_arg)
 +      (Vmark_even_if_inactive, Vmouse_leave_buffer_hook): Remove.
 +      * bytecode.c (syms_of_bytecode): Update.
 +      (Vbyte_code_meter, byte_metering_on): Remove.
 +      * buffer.c (syms_of_buffer): Update.
 +      (Vafter_change_functions, Vbefore_change_functions)
 +      (Vchange_major_mode_hook, Vfirst_change_hook)
 +      (Vinhibit_read_only, Vkill_buffer_query_functions)
 +      (Vtransient_mark_mode, inhibit_modification_hooks): Remove.
 +      * alloc.c (syms_of_alloc): Update.
 +      (Vgc_cons_percentage, Vgc_elapsed, Vmemory_full)
 +      (Vmemory_signal_data, Vpost_gc_hook, Vpurify_flag)
 +      (cons_cells_consed, floats_consed, garbage_collection_messages)
 +      (gc_cons_threshold, gcs_done, intervals_consed)
 +      (misc_objects_consed, pure_bytes_used, string_chars_consed)
 +      (strings_consed, symbols_consed, vector_cells_consed): Remove.
 +
 +      * lisp.h (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL)
 +      (DEFVAR_INT): Assume global is in `globals'.
 +      * alloc.c (globals): Define.
 +
 +2011-01-18  Tom Tromey  <tromey@redhat.com>
 +
 +      * image.c (Vimagemagick_render_type): Remove redundant
 +      definition.
 +
 +2011-01-18  Tom Tromey  <tromey@redhat.com>
 +
 +      * xdisp.c (emacs_scroll_step): Rename from scroll_step.
 +      (try_scrolling): Rename argument to 'arg_scroll_conservatively'.
 +      (redisplay_window): Update.
 +      (syms_of_xdisp): Update.
 +
 +2011-01-18  Tom Tromey  <tromey@redhat.com>
 +
 +      * gtkutil.h (x_gtk_use_old_file_dialog, x_gtk_show_hidden_files)
 +      (x_gtk_file_dialog_help_text, x_gtk_whole_detached_tool_bar):
 +      Declare.
 +      * gtkutil.c (xg_uses_old_file_dialog):
 +      (xg_get_file_with_chooser):
 +      (xg_tool_bar_detach_callback): Don't redeclare globals.
 +
 +2011-01-18  Tom Tromey  <tromey@redhat.com>
 +
 +      * lisp.h (DEFVAR_BUFFER_DEFAULTS): New macro.
 +      * buffer.c (syms_of_buffer): Use DEFVAR_BUFFER_DEFAULTS.
 +
 +2011-01-18  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * lisp.h (DECL_ALIGN): Define if HAVE_ATTRIBUTE_ALIGNED, not if
 +      defined __GNUC__.  ../configure now checks for this GCC feature,
 +      which is now also supported by IBM and Oracle compilers.
 +      (USE_LSB_TAG) [defined DECL_ALIGN]: Also define if defined __sun,
 +      since Solaris malloc returns mult-of-8.
 +
 +2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
  
diff --cc src/window.c
@@@ -51,40 -51,41 +51,41 @@@ along with GNU Emacs.  If not, see <htt
  #include "nsterm.h"
  #endif
  
 -
  Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
  Lisp_Object Qdisplay_buffer;
 -Lisp_Object Qscroll_up, Qscroll_down;
 +Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
  Lisp_Object Qwindow_size_fixed;
  
 -extern Lisp_Object Qleft_margin, Qright_margin;
 -
 -static int displayed_window_lines P_ ((struct window *));
 -static struct window *decode_window P_ ((Lisp_Object));
 -static int count_windows P_ ((struct window *));
 -static int get_leaf_windows P_ ((struct window *, struct window **, int));
 -static void window_scroll P_ ((Lisp_Object, int, int, int));
 -static void window_scroll_pixel_based P_ ((Lisp_Object, int, int, int));
 -static void window_scroll_line_based P_ ((Lisp_Object, int, int, int));
 -static int window_min_size_1 P_ ((struct window *, int, int));
 -static int window_min_size_2 P_ ((struct window *, int, int));
 -static int window_min_size P_ ((struct window *, int, int, int, int *));
 -static void size_window P_ ((Lisp_Object, int, int, int, int, int));
 -static int freeze_window_start P_ ((struct window *, void *));
 -static int window_fixed_size_p P_ ((struct window *, int, int));
 -static void enlarge_window P_ ((Lisp_Object, int, int));
 -static Lisp_Object window_list P_ ((void));
 -static int add_window_to_list P_ ((struct window *, void *));
 -static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
 -                                 Lisp_Object));
 -static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object,
 -                                  Lisp_Object, int));
 -static void decode_next_window_args P_ ((Lisp_Object *, Lisp_Object *,
 -                                       Lisp_Object *));
 -static int foreach_window_1 P_ ((struct window *,
 +static int displayed_window_lines (struct window *);
 +static struct window *decode_window (Lisp_Object);
 +static int count_windows (struct window *);
 +static int get_leaf_windows (struct window *, struct window **, int);
 +static void window_scroll (Lisp_Object, int, int, int);
 +static void window_scroll_pixel_based (Lisp_Object, int, int, int);
 +static void window_scroll_line_based (Lisp_Object, int, int, int);
 +static int window_min_size_1 (struct window *, int, int);
 +static int window_min_size_2 (struct window *, int, int);
 +static int window_min_size (struct window *, int, int, int, int *);
 +static void size_window (Lisp_Object, int, int, int, int, int);
 +static int freeze_window_start (struct window *, void *);
 +static int window_fixed_size_p (struct window *, int, int);
 +static void enlarge_window (Lisp_Object, int, int);
 +static Lisp_Object window_list (void);
 +static int add_window_to_list (struct window *, void *);
 +static int candidate_window_p (Lisp_Object, Lisp_Object, Lisp_Object,
 +                               Lisp_Object);
 +static Lisp_Object next_window (Lisp_Object, Lisp_Object,
 +                                Lisp_Object, int);
 +static void decode_next_window_args (Lisp_Object *, Lisp_Object *,
 +                                     Lisp_Object *);
 +static void foreach_window (struct frame *,
-                             int (* fn) (struct window *, void *),
+                                int (* fn) (struct window *, void *),
 -                               void *));
 -static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
 -static Lisp_Object select_window P_ ((Lisp_Object, Lisp_Object, int));
 +                            void *);
 +static int foreach_window_1 (struct window *,
 +                             int (* fn) (struct window *, void *),
 +                             void *);
 +static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
++static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
  
  /* This is the window in which the terminal's cursor should
     be left when nothing is being done with it.  This must
@@@ -3497,20 -3581,16 +3493,14 @@@ This function runs `window-scroll-funct
    return Qnil;
  }
  
- /* Note that selected_window can be nil when this is called from
-    Fset_window_configuration.  */
+ /* If select_window is called with inhibit_point_swap non-zero it will
+    not store point of the old selected window's buffer back into that
+    window's pointm slot.  This is needed by Fset_window_configuration to
+    avoid that the display routine is called with selected_window set to
+    Qnil causing a subsequent crash.  */
  
- DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
-        doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
- If WINDOW is not already selected, make WINDOW's buffer current
- and make WINDOW the frame's selected window.  Return WINDOW.
- Optional second arg NORECORD non-nil means do not put this buffer
- at the front of the list of recently selected ones and do not
- make this window the most recently selected one.
- Note that the main editor command loop selects the buffer of the
- selected window before each command.  */)
-   (register Lisp_Object window, Lisp_Object norecord)
+ static Lisp_Object
 -select_window (window, norecord, inhibit_point_swap)
 -     Lisp_Object window, norecord;
 -     int inhibit_point_swap;
++select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
  {
    register struct window *w;
    register struct window *ow;
    return window;
  }
  
 -     (window, norecord)
 -     register Lisp_Object window, norecord;
+ /* Note that selected_window can be nil when this is called from
+    Fset_window_configuration.  */
+ DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
+        doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
+ If WINDOW is not already selected, make WINDOW's buffer current
+ and make WINDOW the frame's selected window.  Return WINDOW.
+ Optional second arg NORECORD non-nil means do not put this buffer
+ at the front of the list of recently selected ones and do not
+ make this window the most recently selected one.
+ Note that the main editor command loop selects the buffer of the
+ selected window before each command.  */)
++     (register Lisp_Object window, Lisp_Object norecord)
+ {
+   select_window (window, norecord, 0);
+ }
  static Lisp_Object
 -select_window_norecord (window)
 -     Lisp_Object window;
 +select_window_norecord (Lisp_Object window)
  {
    return WINDOW_LIVE_P (window)
      ? Fselect_window (window, Qt) : selected_window;
@@@ -7046,9 -7222,7 +7052,7 @@@ syms_of_window (void
    window_scroll_preserve_hpos = -1;
    window_scroll_preserve_vpos = -1;
  
-   inhibit_point_swap = 0;
 -  DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function,
 +  DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function,
               doc: /* Non-nil means call as function to display a help buffer.
  The function is called with one argument, the buffer to be displayed.
  Used by `with-output-to-temp-buffer'.