repo.or.cz
/
emacs.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix gitmerge handling of automatic conflict reslution
2017-12-13
Gl
e
nn Morris
Fi
x
gi
t
merge
h
andl
i
ng of
a
ut
o
ma
t
ic
c
onflict
r
eslu
t
ion
commit
|
commitdiff
|
tree
2017-12-12
G
lenn Morris
* lisp
/
mail/emac
s
bug
.
el (report-emacs-bug): Try "sw
_
v
e
r
s
.
.
.
commit
|
commitdiff
|
tree
2017-12-11
Glenn
M
orris
* admin/gitmerge
.
e
l (gitmerge-re
s
o
l
v
e): Disable buggy
.
.
.
commit
|
commitdiff
|
tree
2017-12-10
Glenn
M
o
rris
* test/lisp/net/tramp-
a
rchive-tests
.
el
commit
|
commitdiff
|
tree
2017-12-09
Glenn M
o
rr
i
s
*
l
isp/help-mode
.
el (h
e
lp-f
u
nction-def
)
:
commit
|
commitdiff
|
tree
2017-12-08
G
l
e
n
n
M
orris
* lisp/h
e
l
p-
m
ode
.
el (help-fu
n
ction-def):
commit
|
commitdiff
|
tree
2017-12-04
Glenn Mo
r
ris
D
on'
t
enable e
r
c
modules on
simpl
y
l
o
ading erc
.
el
commit
|
commitdiff
|
tree
2017-12-02
Glenn Morri
s
*
admin/gi
t
merge
.
e
l (git
m
er
g
e
-resolv
e
): Handle NEWS
.
.
.
commit
|
commitdiff
|
tree
2017-12-02
Glenn Morris
Don'
t
h
ard-
c
ode gitmerg
e
.
el's default
merge branch
commit
|
commitdiff
|
tree
2017-12-02
Glenn Morris
* a
d
min/gitmerge
.
e
l
(gitm
e
rg
e
-
r
esolve)
:
commit
|
commitdiff
|
tree
2017-12-02
G
l
en
n
Mor
r
is
* doc/emacs/m
u
l
e
.
t
e
xi (Out
p
ut Coding): Clarify
sendmail
.
.
.
commit
|
commitdiff
|
tree
2017-12-01
G
lenn Morris
;
Auto-commi
t
of l
o
ad
d
efs files
.
commit
|
commitdiff
|
tree
2017-12-01
Glen
n
Morris
; Auto
-
commit of loaddefs f
i
les
.
commit
|
commitdiff
|
tree
2017-11-30
Glenn
Morris
Ma
k
e trun
c
ate-l
i
nes
p
ermanently
loc
a
l (
b
ug#15396)
commit
|
commitdiff
|
tree
2017-11-30
Glenn Morris
Merge from origin/emacs
-
26
commit
|
commitdiff
|
tree
2017-11-30
Gle
n
n Morri
s
; Merge from origin/e
m
acs-
2
6
commit
|
commitdiff
|
tree
2017-11-30
Glenn M
o
rri
s
Merge from o
r
igin/ema
c
s-26
commit
|
commitdiff
|
tree
2017-11-30
Glenn M
o
rr
i
s
;
Merge from or
i
g
i
n/emacs-2
6
commit
|
commitdiff
|
tree
2017-11-30
Glenn Morris
Merg
e
from origin
/
emacs-26
commit
|
commitdiff
|
tree
2017-11-29
Glenn Morris
;
* lisp/emacs-li
s
p
/
b
y
tecomp
.
el: Tweak m
e
s
s
age fo
r
m
at
t
in
g
.
.
.
commit
|
commitdiff
|
tree
2017-11-29
Glenn Morris
Restor
e
o
bsolete method
of changing byt
e
-co
m
p
ile-dest
.
.
.
commit
|
commitdiff
|
tree
2017-11-29
G
lenn Mo
r
ris
Put mos
t
erc autoloads in
a dedica
t
ed fil
e
erc-loaddefs
.
el
commit
|
commitdiff
|
tree
2017-11-29
Glenn Mor
r
is
Remove som
e
bog
u
s definition-prefi
x
es
f
rom loaddef
s
commit
|
commitdiff
|
tree
2017-11-28
G
l
enn M
o
r
ris
; Fix some tiny
doc and comment
typos
commit
|
commitdiff
|
tree
2017-11-28
Glenn Morri
s
; Fix some co
m
men
t
typos
commit
|
commitdiff
|
tree
2017-11-27
G
lenn Morris
Fix probable ty
p
o
i
n
e
l
isp-mode con
s
tant name
commit
|
commitdiff
|
tree
2017-11-27
Glen
n
Morri
s
; * lisp/
e
ma
c
s
-
li
s
p
/bytec
o
mp
.
el (
b
yte-compile
-
dest
.
.
.
commit
|
commitdiff
|
tree
2017-11-27
Glenn
M
orr
i
s
A
f
e
w
small d
o
c
f
i
x
es for
b
ytecomp
.
e
l
commit
|
commitdiff
|
tree
2017-11-27
Glenn Morris
* lisp/t
r
ee-widget
.
e
l
(tree-widget
-
en
d
-guide): Escape
.
.
.
commit
|
commitdiff
|
tree
2017-11-22
G
le
n
n Mor
r
is
; Fix some d
o
c typos
commit
|
commitdiff
|
tree
2017-11-22
Glenn Morr
i
s
* lisp/bindings
.
el (buffer-fil
e
-coding-syst
e
m):
commit
|
commitdiff
|
tree
2017-11-22
G
l
en
n
Morris
* s
r
c
/
f
ns
.
c
(sy
m
s
_of_f
n
s) <overridin
g
-plist-enviro
n
ment
.
.
.
commit
|
commitdiff
|
tree
2017-11-22
Glenn Mo
r
ri
s
* li
s
p/menu
-
bar
.
e
l
(menu-b
a
r-opti
o
ns-s
a
ve):
commit
|
commitdiff
|
tree
2017-11-22
Gl
e
nn Morris
* li
s
p/menu-bar
.
e
l
(menu-ba
r
-options
-
save)
:
commit
|
commitdiff
|
tree
2017-11-22
Glenn Morris
* lisp/follow
.
e
l
(follow-mo
d
e)
:
R
es
t
ore mode
l
ine lighter
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
Gl
e
nn Morris
*
lisp/emacs-lisp/
b
yt
e
-run
.
el (defsubst): Doc fix
.
commit
|
commitdiff
|
tree
2017-11-21
Glenn
M
orris
Avoid bogus abbreviated
f
ile names
i
f HOME changes
commit
|
commitdiff
|
tree
2017-11-21
Glenn M
o
rris
*
lisp/ema
c
s
-lisp/byte
-
run
.
el
(inline):
Give
it
a doc
.
commit
|
commitdiff
|
tree
2017-11-20
Glenn
M
or
r
is
; Merge from or
i
gin
/
e
m
a
c
s-26
commit
|
commitdiff
|
tree
2017-11-20
Glenn Mor
r
i
s
Merg
e
from origin/em
a
cs-2
6
commit
|
commitdiff
|
tree
2017-11-20
Glenn Morris
; Merge
f
r
om orig
i
n/emacs-26
commit
|
commitdiff
|
tree
2017-11-20
Glenn
Morr
i
s
Merge from origin/emacs-26
commit
|
commitdiff
|
tree
2017-11-20
G
l
e
n
n Morris
; Merge from origi
n
/e
m
a
c
s-26
commit
|
commitdiff
|
tree
2017-11-20
Glenn Mo
r
r
is
Merge f
r
om origin/ema
c
s-26
commit
|
commitdiff
|
tree
2017-11-14
Glenn Morri
s
Merge from
origin/emacs-26
commit
|
commitdiff
|
tree
2017-11-09
Gl
e
nn Morri
s
I
n
f90
.
el, set fill-paragraph-fu
n
c
tion to a usefu
l
.
.
.
commit
|
commitdiff
|
tree
2017-11-08
Glenn Mo
r
ris
* admi
n
/gitmerge
.
e
l
(
gi
t
merge-re
s
olve-unmerged): Fix
.
.
.
commit
|
commitdiff
|
tree
2017-11-07
Glenn
Morri
s
; * test/s
r
c/keyboa
r
d
-
tests
.
e
l
:
Standardize copyright
.
.
.
commit
|
commitdiff
|
tree
2017-11-06
Glenn Morris
* tes
t
/
lisp/n
e
t/
t
ram
p
-tests
.
el (tramp-test16-f
i
le-expand
.
.
.
commit
|
commitdiff
|
tree
2017-11-03
Glenn Mo
r
ris
; * CONTRIBUTE,
admin/make-tarball
.
txt: D
o
c twe
a
ks
.
.
.
commit
|
commitdiff
|
tree
2017-11-03
Glenn
M
or
r
i
s
;
Fix
s
ome comment ty
p
os
commit
|
commitdiff
|
tree
2017-11-01
G
lenn Morris
;
A
u
t
o-comm
i
t of loaddefs files
.
commit
|
commitdiff
|
tree
2017-11-01
Glenn Morris
;
Auto-c
o
mmit of loaddefs files
.
commit
|
commitdiff
|
tree
2017-10-29
Glenn Morris
Fix doc typos
commit
|
commitdiff
|
tree
2017-10-28
Glenn
M
orris
Fix
s
o
m
e dupl
i
c
a
te word typos
commit
|
commitdiff
|
tree
2017-10-28
Glenn Morris
Fix
some duplicate
wor
d
s typos
commit
|
commitdiff
|
tree
2017-10-28
Gle
n
n Morri
s
* lisp/but
t
on
.
el (butt
o
n-acti
v
ate):
Fix d
o
c ty
p
o
.
commit
|
commitdiff
|
tree
2017-10-28
Glenn Morris
*
l
i
s
p
/
cal
e
nd
a
r/t
o
do-mode
.
e
l
(to
d
o-toggle-m
a
r
k-item
.
.
.
commit
|
commitdiff
|
tree
2017-10-28
Glenn
M
o
r
r
is
Fix
s
ome
d
o
c
typ
o
s
commit
|
commitdiff
|
tree
2017-10-24
Glenn Morr
i
s
* configure
.
ac (AC_I
N
I
T
): Use
h
tt
p
s for
package url
.
commit
|
commitdiff
|
tree
2017-10-24
G
l
enn Morris
* admin/authors
.
el
(
au
t
hors-ca
n
oni
c
al-auth
o
r
-name):
commit
|
commitdiff
|
tree
2017-10-24
G
l
enn Morris
* test/lisp/progmodes/sql-tests
.
el
commit
|
commitdiff
|
tree
2017-10-24
Glenn Morris
* lisp
/
format
.
el (for
m
at-ali
s
t
)
: Use
i
n
ternal rot13
.
commit
|
commitdiff
|
tree
2017-10-21
Glenn M
o
rris
Merg
e
f
r
om origin/emacs-26
commit
|
commitdiff
|
tree
2017-10-21
Glenn Mo
r
ris
Update descr
i
b
e
-func
t
ion for recent Fd
o
c
ument
a
t
i
on
.
.
.
commit
|
commitdiff
|
tree
2017-10-20
Glenn
M
or
r
is
;
* etc/NEWS: Stop list of old NEWS files growing with
o
ut
.
.
.
commit
|
commitdiff
|
tree
2017-10-20
Glenn Morris
Tweak
Fdocum
e
ntation's er
r
o
r for an unde
f
ined function
commit
|
commitdiff
|
tree
2017-10-20
Glenn
M
o
rris
Tweak format of list of old file
s
in NEWS he
a
der
commit
|
commitdiff
|
tree
2017-10-20
Glen
n
Mo
r
ris
Fix flymake's loading
of subr-x
commit
|
commitdiff
|
tree
2017-10-20
Gle
n
n Morris
I
m
prove t
r
eat
m
ent of Fort
r
an's "clas
s
default"
commit
|
commitdiff
|
tree
2017-10-09
Glenn
Morris
; * lisp/emacs
-
li
s
p/rmc
.
el: Mi
n
o
r
fi
x
f
or cop
y
r
i
ght
.
.
.
commit
|
commitdiff
|
tree
2017-10-02
Glenn Morris
; Aut
o
-
c
ommit of loaddefs files
.
commit
|
commitdiff
|
tree
2017-10-02
Glenn Mo
r
ris
; Auto-commit of l
o
a
d
defs files
.
commit
|
commitdiff
|
tree
2017-10-02
Glenn Morr
i
s
; * lisp
/
emacs-lisp
/
cl-print
.
e
l
(cl-pri
n
1
):
W
hite
s
pac
e
.
.
.
commit
|
commitdiff
|
tree
2017-09-29
G
l
enn Morris
; Standardize l
i
cen
s
e not
i
ces
commit
|
commitdiff
|
tree
2017-09-16
Glenn Mor
r
i
s
* te
s
t/src
/
l
c
ms-te
s
ts
.
el (l
c
ms-whitepo
i
n
t
):
Skip if
.
.
.
commit
|
commitdiff
|
tree
2017-09-16
G
lenn
M
o
r
ris
* test/
s
rc/lcms-tests
.
e
l
(
lc
m
s-cri-cam
0
2
-ucs): Skip
.
.
.
commit
|
commitdiff
|
tree
2017-09-16
Glenn Morris
*
t
e
s
t/s
r
c/lcms-test
s
.
el (lcms-whitepoin
t
): Skip if
.
.
.
commit
|
commitdiff
|
tree
2017-09-14
Gle
n
n Morris
* lisp/net
/
tls
.
el (tls-program):
Fix :vers
i
on
.
commit
|
commitdiff
|
tree
2017-09-11
Glenn Mor
r
is
Improve reproducibilit
y
of generated le
i
m-list
.
el
commit
|
commitdiff
|
tree
2017-09-07
Glenn
M
orris
S
k
ip emacsclient tests if
-
-
e
nable-profilin
g
was
u
se
d
commit
|
commitdiff
|
tree
2017-09-06
Glenn Morris
;
*
lis
p
/ema
c
s-lisp/ert
.
e
l
(ert-batch-backtrace-right
.
.
.
commit
|
commitdiff
|
tree
2017-09-06
Glenn Mor
r
is
All
o
w for
adjusting li
n
e leng
t
h of
t
e
st
bac
k
traces
commit
|
commitdiff
|
tree
2017-09-06
G
lenn Morr
i
s
Allow
c
ustomizing lin
e
length of ert
b
acktra
c
es
i
n
.
.
.
commit
|
commitdiff
|
tree
2017-09-05
Glenn
M
orri
s
Minor emacsclient-tests simplifi
c
a
t
ion
commit
|
commitdiff
|
tree
2017-09-05
Glenn Morris
emacsclient
-
tests:
remov
e
some debug statements
commit
|
commitdiff
|
tree
2017-09-04
G
l
e
n
n
Morris
emacs
c
l
ient-test
s
: add s
o
me debug state
m
e
nts
commit
|
commitdiff
|
tree
2017-09-03
Glenn Mo
r
r
i
s
emacsclien
t
-te
s
ts: call-process may return non-in
t
eg
e
r
commit
|
commitdiff
|
tree
2017-09-01
Gle
n
n Morris
* test/Makefile
.
in (check-n
o
-
automated-subdi
r
): Sile
n
c
e
.
.
.
commit
|
commitdiff
|
tree
2017-09-01
Glenn
M
or
r
is
* test/Makefil
e
.
in (ELFILES): Sort
,
for a
r
eproducible
.
.
.
commit
|
commitdiff
|
tree
2017-09-01
Glenn Morris
; Aut
o
-commit
o
f
l
oaddefs fi
l
e
s
.
commit
|
commitdiff
|
tree
2017-08-27
Glenn Mo
r
r
is
Fix previous xterm
.
h change for non-gtk bui
l
d
s
commit
|
commitdiff
|
tree
2017-08-18
Glen
n
Morr
i
s
*
doc/e
m
acs/files
.
texi (Copyin
g
and Naming)
:
Avoid
.
.
.
commit
|
commitdiff
|
tree
2017-08-14
Glen
n
Morris
Clean up temp files
a
fter
s
ome tests
commit
|
commitdiff
|
tree
2017-08-01
Glenn Mor
r
is
;
Auto-c
o
mmit of loaddefs
files
.
commit
|
commitdiff
|
tree
2017-07-26
Gl
e
nn M
o
rris
*
d
oc/lispr
e
f/
l
oadin
g
.
texi (
W
hen to A
u
to
l
oad): New
.
.
.
commit
|
commitdiff
|
tree
2017-07-26
G
lenn
Mor
r
is
Stop using unibyt
e
bu
f
f
er
s
for ert backtrace
s
commit
|
commitdiff
|
tree
2017-07-24
G
l
e
nn M
o
rris
* co
n
figure
.
ac
:
Be expl
i
cit about Ima
g
eMagick
v
ersion
.
.
.
commit
|
commitdiff
|
tree
2017-07-23
Glenn M
o
rris
Don't automatica
l
ly enable G
c
onf if Gse
t
ti
n
g
s
was found
commit
|
commitdiff
|
tree
2017-07-23
Glenn Mor
r
is
* configur
e
.
a
c
(MODULES_SU
F
FIX): Always give
i
t a valu
e
.
commit
|
commitdiff
|
tree
next