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
Glenn Morris
Fi
x
gitmerge han
d
li
n
g
of automatic c
o
nflic
t
r
eslution
commit
|
commitdiff
|
tree
2017-12-12
Glenn Morris
Mak
e
functions invocation-dir
e
ctory
a
nd invocation
.
.
.
commit
|
commitdiff
|
tree
2017-12-12
Glenn
Morris
* lisp
/
m
ail
/
emacsbug
.
el (report-emacs-bug):
T
ry "sw_vers
.
.
.
commit
|
commitdiff
|
tree
2017-12-11
Glenn
Morris
* admin/gitmerge
.
el
(gitmerge-resolve): Disab
l
e
buggy
.
.
.
commit
|
commitdiff
|
tree
2017-12-10
Glenn Morris
* test/lisp/
n
et/tramp
-
ar
c
h
ive-tests
.
el
commit
|
commitdiff
|
tree
2017-12-09
G
l
enn Morris
*
lisp/help-mo
d
e
.
el (help-fu
n
c
t
ion-def):
commit
|
commitdiff
|
tree
2017-12-08
Glenn Mor
r
is
* lisp/h
e
lp-mode
.
el (help
-
f
unct
i
on-def):
commit
|
commitdiff
|
tree
2017-12-04
Gl
e
n
n Morris
Don
'
t enable erc
m
o
d
ules o
n
simply loadin
g
erc
.
e
l
commit
|
commitdiff
|
tree
2017-12-02
Glenn M
o
rris
*
a
dmin/gitmer
g
e
.
el
(
gitmerge-re
s
olve): Handle NEWS
.
.
.
commit
|
commitdiff
|
tree
2017-12-02
Glenn Morris
D
o
n't
h
a
r
d-code
gitmerge
.
el's default merge branch
commit
|
commitdiff
|
tree
2017-12-02
Glenn Morris
* admin/gitme
r
g
e
.
e
l
(gitmerge-resolve
)
:
commit
|
commitdiff
|
tree
2017-12-02
Glenn Morris
* doc/em
a
cs/mu
l
e
.
t
exi (Ou
t
put
Coding): Cla
r
ify sen
d
mail
.
.
.
commit
|
commitdiff
|
tree
2017-12-01
Glenn
Morr
i
s
; Auto
-
commit of loaddefs file
s
.
commit
|
commitdiff
|
tree
2017-12-01
Glenn Morris
; Auto
-
c
o
mmit of loadde
f
s files
.
commit
|
commitdiff
|
tree
2017-11-30
Glenn
Morris
Make truncate-lines per
m
an
e
ntly local (bug#15396)
commit
|
commitdiff
|
tree
2017-11-30
Glenn Morr
i
s
Merge
from origin/emacs
-
26
commit
|
commitdiff
|
tree
2017-11-30
Glen
n
Morris
;
M
erg
e
from origin/em
a
cs-26
commit
|
commitdiff
|
tree
2017-11-30
Glenn Morris
Merge fr
o
m ori
g
in/em
a
cs-26
commit
|
commitdiff
|
tree
2017-11-30
Glenn Morris
; Merge from origin/emacs-2
6
commit
|
commitdiff
|
tree
2017-11-30
G
len
n
Morris
Merge fro
m
origin/
e
ma
c
s-26
commit
|
commitdiff
|
tree
2017-11-29
Glenn Morris
; * lisp/e
m
a
c
s-
l
isp/
b
yte
c
o
m
p
.
el: Twea
k
m
e
s
s
age formatti
n
g
.
.
.
commit
|
commitdiff
|
tree
2017-11-29
Glenn
Morris
Rest
o
re obsolet
e
method of changing byte
-
compile-
d
est
.
.
.
commit
|
commitdiff
|
tree
2017-11-29
Glenn Morris
P
ut mos
t
erc
au
t
oloa
d
s in a dedic
a
ted file e
r
c-loaddef
s
.
el
commit
|
commitdiff
|
tree
2017-11-29
Gl
e
nn Mor
r
is
Remove some bo
g
us defini
t
ion-prefixes fr
o
m
l
o
a
d
d
e
f
s
commit
|
commitdiff
|
tree
2017-11-28
G
lenn Mor
r
is
; Fix so
m
e tiny doc and com
m
ent typos
commit
|
commitdiff
|
tree
2017-11-28
G
lenn Mo
r
ris
; Fi
x
some comme
n
t
t
ypos
commit
|
commitdiff
|
tree
2017-11-27
G
l
enn Morr
i
s
Fix
probable typo in elisp-mo
d
e
con
s
tant n
a
me
commit
|
commitdiff
|
tree
2017-11-27
Glenn M
o
rri
s
; * lisp
/
emacs-l
i
sp/
b
ytecomp
.
el
(
b
y
t
e-compile-dest
.
.
.
commit
|
commitdiff
|
tree
2017-11-27
Glenn Morris
A
few
s
m
a
ll
d
o
c
fixes
fo
r
byte
c
omp
.
el
commit
|
commitdiff
|
tree
2017-11-27
G
lenn Morris
* lisp/tree-w
i
dget
.
el (tree-
w
id
g
et
-
end-guide):
E
s
c
ape
.
.
.
commit
|
commitdiff
|
tree
2017-11-22
Glenn Morris
; Fix som
e
d
oc
t
ypos
commit
|
commitdiff
|
tree
2017-11-22
Glenn
M
o
r
ris
* lisp/bindings
.
el
(
buffer-file-c
o
ding-s
y
stem):
commit
|
commitdiff
|
tree
2017-11-22
Glenn Mor
r
is
* src/f
n
s
.
c (syms_of_fns) <overridin
g
-plist
-
e
nvironment
.
.
.
commit
|
commitdiff
|
tree
2017-11-22
Glenn Morris
* l
i
s
p
/menu-b
a
r
.
e
l
(
m
enu-bar-o
p
tions-s
a
ve):
commit
|
commitdiff
|
tree
2017-11-22
Glenn Morr
i
s
*
lis
p
/menu-bar
.
el (menu-bar-options-save)
:
commit
|
commitdiff
|
tree
2017-11-22
Glenn Morri
s
* lisp/follow
.
el (follow-m
o
de): Res
t
ore mode l
i
ne lighter
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
G
l
enn Morris
* lisp/emacs-lisp/b
y
t
e
-run
.
el
(
de
f
subst
)
: Doc
f
i
x
.
commit
|
commitdiff
|
tree
2017-11-21
G
l
enn Morris
Avoid bogus ab
b
reviated
f
i
le names
if
HOME
c
h
anges
commit
|
commitdiff
|
tree
2017-11-21
Gl
e
nn Morr
i
s
* lisp/e
m
acs-lisp/by
t
e-run
.
el
(
in
l
in
e
)
: Give it a doc
.
commit
|
commitdiff
|
tree
2017-11-20
Glenn Morris
; Merge from
origin/em
a
cs-26
commit
|
commitdiff
|
tree
2017-11-20
Glenn
Morr
i
s
Merg
e
from origin/
e
macs-26
commit
|
commitdiff
|
tree
2017-11-20
Glenn Morr
i
s
; Mer
g
e
from ori
g
in/ema
c
s
-
26
commit
|
commitdiff
|
tree
2017-11-20
Gl
e
nn Morri
s
M
erge from o
r
igin/emacs
-
26
commit
|
commitdiff
|
tree
2017-11-20
Gl
e
nn Morris
; Merge from origin/
e
macs-26
commit
|
commitdiff
|
tree
2017-11-20
Glenn Morris
Me
r
ge from origin/emacs-26
commit
|
commitdiff
|
tree
2017-11-14
Glen
n
M
o
rris
M
erge from origin/ema
c
s-26
commit
|
commitdiff
|
tree
2017-11-09
Glen
n
Mor
r
is
In f90
.
el, se
t
fill-par
a
graph-funct
i
o
n
t
o a useful
.
.
.
commit
|
commitdiff
|
tree
2017-11-08
Glenn Morris
* admin/gitmerge
.
e
l
(gitmerge-res
o
lve-unmerge
d
)
:
Fix
.
.
.
commit
|
commitdiff
|
tree
2017-11-07
Gl
e
nn Mo
r
r
i
s
;
* test/src
/
keyb
o
ard-
t
e
sts
.
el: Standardize copyright
.
.
.
commit
|
commitdiff
|
tree
2017-11-06
Glenn Morris
* test/li
s
p/
n
et/tramp-tests
.
el
(tramp-test16-fi
l
e-expa
n
d
.
.
.
commit
|
commitdiff
|
tree
2017-11-03
G
l
e
n
n Morr
i
s
; * CONTRIBUTE, admin/make-ta
r
bal
l
.
t
x
t: Doc tweaks
.
.
.
commit
|
commitdiff
|
tree
2017-11-03
Gl
e
nn Morris
; Fix s
o
me com
m
ent typos
commit
|
commitdiff
|
tree
2017-11-01
Glen
n
Morris
;
A
ut
o
-commit of loaddefs files
.
commit
|
commitdiff
|
tree
2017-11-01
Glenn M
o
rri
s
; Auto-com
m
it of loa
d
defs
f
iles
.
commit
|
commitdiff
|
tree
2017-10-29
Glen
n
M
o
rris
Fix doc typos
commit
|
commitdiff
|
tree
2017-10-28
Glenn Morris
Fix some duplicate word typos
commit
|
commitdiff
|
tree
2017-10-28
Glenn
Morri
s
F
i
x some duplicate words typos
commit
|
commitdiff
|
tree
2017-10-28
Gle
n
n Mo
r
ris
* lisp/button
.
el (butt
o
n-act
i
vate
)
:
Fix doc ty
p
o
.
commit
|
commitdiff
|
tree
2017-10-28
Glenn Morri
s
* lisp/c
a
lendar
/
tod
o
-
mode
.
el (t
o
do-
t
oggle-mark-it
e
m
.
.
.
commit
|
commitdiff
|
tree
2017-10-28
Glenn M
o
rris
F
ix some
d
oc typos
commit
|
commitdiff
|
tree
2017-10-24
Glenn Morris
* c
o
nfi
g
ur
e
.
ac (AC
_
INIT): Use
h
ttp
s
f
or packa
g
e
url
.
commit
|
commitdiff
|
tree
2017-10-24
Glenn Morris
*
a
d
min/author
s
.
el (autho
r
s-canonical-author-name):
commit
|
commitdiff
|
tree
2017-10-24
Glenn
Morr
i
s
* test/lisp/p
r
ogmode
s
/sql-tests
.
el
commit
|
commitdiff
|
tree
2017-10-24
G
l
enn
M
orris
* lisp/forma
t
.
el
(fo
r
m
at-alist):
Use intern
a
l rot13
.
commit
|
commitdiff
|
tree
2017-10-21
Glenn
M
orris
Merg
e
fro
m
origin/emacs-26
commit
|
commitdiff
|
tree
2017-10-21
Glenn
M
orris
Update desc
r
ibe-function for recent Fd
o
cumentation
.
.
.
commit
|
commitdiff
|
tree
2017-10-20
Gle
n
n Morris
;
* etc/NEWS: Stop list
o
f
o
ld NEW
S
file
s
growing without
.
.
.
commit
|
commitdiff
|
tree
2017-10-20
Glenn Morris
Twea
k
Fdocumentation's error f
o
r
an
undef
i
ned function
commit
|
commitdiff
|
tree
2017-10-20
Gle
n
n M
o
rris
T
w
e
ak f
o
rmat of list of
o
ld file
s
in NEWS
h
ea
d
er
commit
|
commitdiff
|
tree
2017-10-20
Gl
e
nn Morris
Fix flym
a
ke's loadi
n
g
o
f
s
u
br-x
commit
|
commitdiff
|
tree
2017-10-20
Glenn
Morr
i
s
I
mprove treatmen
t
of Fortran'
s
"cl
a
s
s
de
f
ault"
commit
|
commitdiff
|
tree
2017-10-09
Glenn Morris
; * li
s
p/
e
ma
c
s-lisp/rmc
.
el
:
Minor fix for copyright
.
.
.
commit
|
commitdiff
|
tree
2017-10-02
Glenn Morris
;
Aut
o
-
c
ommit of
l
o
a
d
defs files
.
commit
|
commitdiff
|
tree
2017-10-02
Glenn
Morris
;
A
uto-commit of loa
d
defs
f
iles
.
commit
|
commitdiff
|
tree
2017-10-02
G
l
e
n
n Morris
; * lisp/e
m
acs
-
lisp/cl-print
.
el (cl-
p
rin1): Whi
t
espace
.
.
.
commit
|
commitdiff
|
tree
2017-09-29
Glenn
Morris
;
S
t
andardize l
i
cense
n
otices
commit
|
commitdiff
|
tree
2017-09-16
Glenn Morris
*
tes
t
/sr
c
/lcms-tests
.
el (l
c
m
s-whitepoint): Ski
p
if
.
.
.
commit
|
commitdiff
|
tree
2017-09-16
Glenn Mor
r
is
* test/s
r
c/
l
cms-tes
t
s
.
e
l
(lcm
s
-cri-cam0
2
-u
c
s
): Ski
p
.
.
.
commit
|
commitdiff
|
tree
2017-09-16
Glenn Mor
r
i
s
* test/src
/
lcms-tests
.
el (lcms-whi
t
epo
i
n
t): Skip if
.
.
.
commit
|
commitdiff
|
tree
2017-09-14
Glenn Morris
* lis
p
/net/tls
.
el (tls-program): Fix :ver
s
ion
.
commit
|
commitdiff
|
tree
2017-09-11
Glenn Morris
I
m
prove re
p
roducibility of generated
leim-list
.
el
commit
|
commitdiff
|
tree
2017-09-07
Glenn Morris
Skip emacsclient t
e
sts
if --ena
b
le-
p
rofil
i
ng was use
d
commit
|
commitdiff
|
tree
2017-09-06
Glenn Morris
; * lisp/
e
macs-li
s
p/ert
.
e
l (ert-batch-b
a
cktr
a
ce-right
.
.
.
commit
|
commitdiff
|
tree
2017-09-06
Glenn
Morris
Allow for adj
u
sting line length of t
e
st b
a
cktrac
e
s
commit
|
commitdiff
|
tree
2017-09-06
Glenn Morris
Allow customizing l
i
ne
l
e
n
gth of ert backtraces in
.
.
.
commit
|
commitdiff
|
tree
2017-09-05
G
l
e
n
n
M
orris
Minor
e
macsclient-tests simplifica
t
ion
commit
|
commitdiff
|
tree
2017-09-05
G
lenn Morris
emacs
c
l
i
e
n
t-tests: remove
s
ome debug state
m
ents
commit
|
commitdiff
|
tree
2017-09-04
Glenn Morri
s
emacscl
i
ent-
t
e
sts: add some debug stat
e
ments
commit
|
commitdiff
|
tree
2017-09-03
Glenn
M
or
r
is
emacscl
i
e
nt-tests:
call-proce
s
s
m
a
y
return non-
i
n
teger
commit
|
commitdiff
|
tree
2017-09-01
Glenn
Mo
r
ris
* test/Makefile
.
i
n
(check-n
o
-a
u
t
o
ma
t
ed
-
subd
i
r): Silen
c
e
.
.
.
commit
|
commitdiff
|
tree
2017-09-01
Gl
e
nn Mor
r
is
* te
s
t/Ma
k
ef
i
le
.
in (ELF
I
LES): Sort, for
a
repr
o
ducible
.
.
.
commit
|
commitdiff
|
tree
2017-09-01
G
lenn Morris
; Auto-co
m
mit of loaddefs files
.
commit
|
commitdiff
|
tree
2017-08-27
Glenn
M
orris
Fix pr
e
v
i
ous xterm
.
h change for non-g
t
k
bui
l
ds
commit
|
commitdiff
|
tree
2017-08-18
Glenn Morris
* doc/emacs/fi
l
e
s
.
texi (Cop
y
ing a
n
d Naming): Avoid
.
.
.
commit
|
commitdiff
|
tree
2017-08-14
Gle
n
n Morris
Clea
n
up temp fi
l
es afte
r
some tests
commit
|
commitdiff
|
tree
2017-08-01
Gl
e
nn
Morris
; Au
t
o-commit
of loaddefs
files
.
commit
|
commitdiff
|
tree
2017-07-26
G
lenn Morri
s
* doc/lispref/load
i
ng
.
te
x
i (Wh
e
n to Autol
o
ad):
New
.
.
.
commit
|
commitdiff
|
tree
2017-07-26
Glenn Mo
r
ris
Stop us
i
ng uni
b
yte buf
f
ers for ert backtraces
commit
|
commitdiff
|
tree
2017-07-24
Glenn Morris
* config
u
re
.
ac:
Be exp
l
i
cit
a
bout
ImageMagi
c
k vers
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2017-07-23
Glenn Morris
Don't
a
u
tomatically enable
Gco
n
f if Gsettings
w
as found
commit
|
commitdiff
|
tree
next