GNU Emacs

~ubuntu-elisp/emacs/+git/master:scratch/resolve-cc-mode-and-e-p-m

  1. Git
  2. lp:~ubuntu-elisp/emacs/+git/master
  3. scratch/resolve-cc-mode-and-e-p-m
Last commit made on 2019-01-21
Get this branch:
git clone -b scratch/resolve-cc-mode-and-e-p-m https://git.launchpad.net/~ubuntu-elisp/emacs/+git/master

Branch merges

Branch information

Name:
scratch/resolve-cc-mode-and-e-p-m
Repository:
lp:~ubuntu-elisp/emacs/+git/master

Recent commits

7c0d312... by =?utf-8?b?Sm/Do28gVMOhdm9yYQ==?= <email address hidden>

Properly solve incompatibility between e-p-m, e-l-m and cc-mode

* lisp/progmodes/cc-cmds.el (c--disable-fix-of-bug-33794): Remove.
(c--with-post-self-insert-hook-maybe): Remove.
(c-self-insert-command): New function.
(c-electric-pound, c-electric-brace, c-electric-slash)
(c-electric-star, c-electric-lt-gt, c-electric-paren): Use it.

* test/lisp/electric-tests.el (c--disable-fix-of-bug-33794):
Remove.
(electric-layout-int-main-kernel-style)
(electric-layout-int-main-allman-style): Don't set
c--disable-fix-of-bug-33794.

6bac9ea... by Eli Zaretskii

Improve documentation of portable dumping

* src/pdumper.c (Fdump_emacs_portable): Improve the doc string
and the error messages.

* doc/lispref/internals.texi (Building Emacs): Document
portable dumping and the 'dump-emacs-portable' function.

957090b... by Glenn Morris

Merge from origin/emacs-26

b6d78a0 (origin/emacs-26) Fix a typo in ELisp manual
c9f6f86 Prevent redrawing if frame is garbaged
00ba226 Attempt to fix hangs on MS-Windows due to C-g
b26d637 Fix Calc graph output on MS-Windows
03818b0 Fix a minor mistake in ELisp manual
6ac5985 ; Fix some trivial doc typos
21b9026 * etc/tutorials/TUTORIAL: Fix typo (bug#34049)
d223727 Fix UI of Buffer-menu
0f71655 Reinitialize ispell-really-enchant when changing the speller
9845044 Speed up loading css-mode

5e3b0f5... by Eli Zaretskii

Clean up memory allocation and unexec support on MS-Windows

* src/w32heap.c (report_temacs_memory_usage): Condition on
!CANNOT_DUMP, in addition to ENABLE_CHECKING.
(init_heap): Accept an argument, which tells us what heap
allocation method to use.
(DUMPED_HEAP_SIZE) [CANNOT_DUMP]: Define to a small value, as
we don't use dumped_data[] in this case.
* src/w32heap.h (init_heap): Adjust prototype.
<using_dynamic_heap>: Remove declaration.
* src/emacs.c (main) [WINDOWSNT]: Determine heap allocation
method based on whether we are in temacs and whether unexec
will be used to dump Emacs. Pass the heap allocation method
to init_heap, which is now called after parsing the
--temacs=METHOD option.
* src/unexw32.c (unexec): Don't fiddle with using_dynamic_heap.
<using_dynamic_heap>: Remove definition.
* src/w32proc.c (malloc_before_init, realloc_before_init)
(free_before_init): New functions, to catch memory allocation
before heap allocation method is set up.

f943409... by Eli Zaretskii

; * etc/NEWS: Fix description of pdumper.

b6d78a0... by Eli Zaretskii

Fix a typo in ELisp manual

* doc/lispref/nonascii.texi (Converting Representations): Fix
inconsistency between @defun and the argument description of
'byte-to-string'. (Bug#34119)

fbe87d0... by Dmitry Gutov

Rebase project-find-regexp on top of project-files

* lisp/progmodes/project.el (project--files-in-directory):
New function.
(project-files, project-find-regexp): Use it.
(project--dir-ignores): New function.
(project--find-regexp-in): Remove.
(project--process-file-region): New function.
(project--find-regexp-in-files): New function.
(project-find-regexp, project-or-external-find-regexp): Use it, and
project-files as well.

afc8a41... by Dmitry Gutov

; Update the number

d8da091... by Dmitry Gutov

Make 'project-files' the "canonical" generic of the two

* lisp/progmodes/project.el (project-files): Move the actual
command building and invocation here.
(project-file-completion-table): Delegate to 'project-files'.

e99a124... by Stefan Monnier

* lisp/textmodes/sgml-mode.el: Try and fix bug#33887.

Remove redundant :group args.
(sgml-syntax-propertize-rules): Speed up processing of most double quotes.