]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2016 19:55:06 +0000 (12:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2016 19:55:06 +0000 (12:55 -0700)
c3489d0 * lisp/w32-fns.el (set-message-beep, w32-get-locale-info) (w3...
a4d882c Correct old cell name unbinding when renaming cell.
6c12c53 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into...
0be6725 Document problem: slow screen refresh on missing font.
853b9b9 * admin/admin.el (add-release-logs): Basic check of existing ...
5fa80cf * build-aux/gitlog-to-emacslog: Handle empty generated Change...
3c79e51 * admin/admin.el (add-release-logs): Generate ChangeLog if ne...
42275df * doc/misc/texinfo.tex: Revert previous change (Bug#23611).
3f4a9d9 * admin/authors.el (authors): First update the ChangeLog.
897fb6f ; 'Changes from the pre-25.1 API' copyedits
825ca25 Rename vc-stay-local back to vc-cvs-stay-local
4efb3e8 * doc/emacs/files.texi (Comparing Files): * doc/emacs/trouble...
b995d1e * doc/misc/eww.texi (Advanced): Fix xref.
2e589c0 Fix cross-references between manuals
f3d2ded * doc/misc/vhdl-mode.texi (Sample Init File): Rename node to ...
906c810 ; * admin/release-process: Move etc/HISTORY from here... ; * ...
bea1b65 * admin/admin.el (add-release-logs): Also update etc/HISTORY.
503e752 ; * CONTRIBUTE: Fix a typo.
fbfd478 Avoid aborting due to errors in arguments of 'set-face-attrib...
bdfbe6d ; * admin/release-process: Copyedits.
44a6aed ; * test/automated/data-tests.el: Standardize license notice.
c33ed39 ; * test/automated/viper-tests.el: Standardize license notice.
df4a14b Add automated test for viper-tests.el
c0139e3 Fix viper undo breakage from undo-boundary changes
920d76c Fix reference to obsolete fn ps-eval-switch
18a9bc1 Do not trash symlinks to init file
2671179 Don't print the "decomposition" line for control chars in wha...
869092c Bring back xterm pasting with middle mouse
5ab0830 Provide workaround for xftfont rendering problem
c9f7ec7 * lisp/desktop.el: Disable restore frameset if in non-graphic...
30989a0 Mention GTK+ problems in etc/PROBLEMS
421e3c4 * lisp/emacs-lisp/package.el (package-refresh-contents):
dadfc30 Revert "epg: Add a way to detect gpg1 executable for tests"
e41a5cb Avoid errors with Czech and Slovak input methods
d4ae6d7 epg: Add a way to detect gpg1 executable for tests
ebc3a94 * lisp/emacs-lisp/package.el: Fix free variable warnings.
6e71295 * lisp/emacs-lisp/package.el (package--with-response-buffer):
c45d9f6 Improve documentation of 'server-name'
3b5e38c Modernize ASLR advice in etc/PROBLEMS
1fe1e0a * lisp/char-fold.el: Rename from character-fold.el.

23 files changed:
1  2 
CONTRIBUTE
admin/release-process
build-aux/gitlog-to-emacslog
doc/emacs/files.texi
doc/emacs/misc.texi
doc/emacs/trouble.texi
doc/misc/eww.texi
doc/misc/url.texi
etc/NEWS
etc/PROBLEMS
lisp/emacs-lisp/package.el
lisp/emulation/viper-cmd.el
lisp/menu-bar.el
lisp/replace.el
lisp/ses.el
lisp/simple.el
lisp/term/xterm.el
lisp/vc/vc-cvs.el
lisp/w32-fns.el
src/xfaces.c
test/lisp/char-fold-tests.el
test/lisp/emacs-lisp/package-tests.el
test/src/data-tests.el

diff --cc CONTRIBUTE
Simple merge
index 2668ea3b445aed3af966a5e8270012742ec30c2a,e4ef4d94647ef4bec21f6ed6d7f7a3d2a84d69e7..28f2307846d02b46e79b1320c2fc51c2489c7253
@@@ -41,11 -43,11 +43,12 @@@ See admin/gitmerge.el
  
  * RELEASE-CRITICAL BUGS
  
- Emacs uses the "blocking bug(s)" feature of Debbugs for bugs need to
be addressed in the next release.
+ Emacs uses the "blocking" feature of Debbugs for bugs that need to be
+ addressed in the next release.
  
  Currently, bug#19759 is the tracking bug for release of 25.1 and
 +bug#21966 is the tracking bug for release of 25.2.  Say bug#123 needs
+ bug#21966 is the tracking bug for the next release.  Say bug#123 needs
  to be fixed for Emacs 25.1.  Send a message to control@debbugs.gnu.org
  that says:
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/replace.el
Simple merge
diff --cc lisp/ses.el
index a87386e17307b5543c7fb7445c9acf3436303ad4,ab9f0715fd8a55d4cc009cc01e55cc21c5de5923..b2fd2bbe9a5df0a95135eef873918372fa77b61a
@@@ -3455,9 -3454,18 +3455,18 @@@ highlighted range in the spreadsheet.
      (setq cell (or cell (ses-get-cell row col))
          old-name (ses-cell-symbol cell)
          new-rowcol (ses-decode-cell-symbol (symbol-name new-name)))
+     ;; when ses-rename-cell is called interactively, then 'sym' is the
+     ;; 'cursor-intangible' property of text at cursor position, while
+     ;; 'old-name' is the symbol stored in array cell at coordinate
+     ;; 'rowcol' corresponding to 'ses-cell' property of symbol
+     ;; 'sym'. Both must be the same.
+     (unless (eq sym old-name)
+       (error "Spreadsheet is broken, both symbols %S and %S refering to cell (%d,%d)" sym old-name row col))
      (if new-rowcol
 -        ;; inferred from new name 
+         ;; the new name is of A1 type, so we test that the coordinate
++        ;; inferred from new name
        (if (equal new-rowcol rowcol)
-         (put new-name 'ses-cell rowcol)
+             (put new-name 'ses-cell rowcol)
          (error "Not a valid name for this cell location"))
        (setq ses--named-cell-hashmap
              (or ses--named-cell-hashmap (make-hash-table :test 'eq)))
diff --cc lisp/simple.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/w32-fns.el
Simple merge
diff --cc src/xfaces.c
Simple merge
index 0000000000000000000000000000000000000000,485254aa6cfa2bd848cc2417684f00d0b9d61128..485254aa6cfa2bd848cc2417684f00d0b9d61128
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge