aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMario Lang2014-06-23 01:12:17 +0200
committerMario Lang2014-06-23 01:12:17 +0200
commit33848c48a5e8823f44994624443fabdf615292dc (patch)
treec62a3d49a425a8b237c0394e6302ae1406bc0cae /src
parent9c3883b47dabec27d9fde206f3f951387fe946fd (diff)
downloademacs-33848c48a5e8823f44994624443fabdf615292dc.tar.gz
emacs-33848c48a5e8823f44994624443fabdf615292dc.zip
"the the", "from from" and "and and".
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32fns.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ca45462cab3..fe3a570ee3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-06-22 Mario Lang <mlang@delysid.org>
2
3 * w32fns.c (Fw32_shell_execute): The the -> the.
4
12014-06-22 Dmitry Antipov <dmantipov@yandex.ru> 52014-06-22 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 * xmenu.c (mouse_position_for_popup): 7 * xmenu.c (mouse_position_for_popup):
diff --git a/src/w32fns.c b/src/w32fns.c
index c9a83c98234..057bc95ee94 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6894,7 +6894,7 @@ operations:
6894 \"runas\" - run DOCUMENT, which must be an excutable file, with 6894 \"runas\" - run DOCUMENT, which must be an excutable file, with
6895 elevated privileges (a.k.a. \"as Administrator\"). 6895 elevated privileges (a.k.a. \"as Administrator\").
6896 \"properties\" 6896 \"properties\"
6897 - open the the property sheet dialog for DOCUMENT. 6897 - open the property sheet dialog for DOCUMENT.
6898 nil - invoke the default OPERATION, or \"open\" if default is 6898 nil - invoke the default OPERATION, or \"open\" if default is
6899 not defined or unavailable. 6899 not defined or unavailable.
6900 6900