• Paul Eggert's avatar
    Merge from origin/emacs-25 · c3ed7cea
    Paul Eggert authored
    16e5e8e4 Fix last change to isearch-update (bug#23406)
    b755d988 Autoload cursor-sensor-inhibit (bug#23406)
    b52ebd4f org-map-entries: Fix org-agenda-prepare-buffers call
    86aa4094 Followup for last commit in the user manual
    70044595 Improve doc string of 'set-goal-column'
    ccdaf04c Fix the MSDOS build
    ffe701cb Remove \= from format string (bug#18190)
    1c58fa1d Fix variable-pitch font on MS-Windows
    c6077bfd Restore follow-scroll-up/down to scrolling by the combined si...
    b671e218 Revert unneeded change which harms syntactic parsing.  This f...
    48b24c9b Correct indentation of ids in a C++ enum after a protection k...
    5c3534ff * lisp/window.el (window--process-window-list): No-op if no p...
    734fb3ac Port dumping to NetBSD with PaX
    0255a70c Don't mistake `for' inside a function for a part of array com...
    
    # Conflicts:
    #	src/Makefile.in
    c3ed7cea
frame.c 166 KB