admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/j6t/gitk

Browse Source 
* 'master' of https://github.com/j6t/gitk:
  gitk: do not hard-code color of search results in commit list
  gitk: place file name arguments after options in msgfmt call
  gitk: Legacy widgets doesn't have combobox
This commit is contained in:
Junio C Hamano
2025-05-29 09:02:14 -07:00
parent b32feae0f1 bfb0fa7099
commit 6ab5693aa2
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gitk-git/Makefile
View File

@@ -73,7 +73,7 @@ update-po:: $(PO_TEMPLATE)
$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
$(ALL_MSGFILES): %.msg : %.po $(ALL_MSGFILES): %.msg : %.po
@echo Generating catalog $@ @echo Generating catalog $@
$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $<
.PHONY: all install uninstall clean update-po .PHONY: all install uninstall clean update-po
.PHONY: FORCE .PHONY: FORCE

10
gitk-git/gitk
View File

@@ -7108,7 +7108,7 @@ proc findselectline {l} {
# mark the bits of a headline or author that match a find string # mark the bits of a headline or author that match a find string
proc markmatches {canv l str tag matches font row} { proc markmatches {canv l str tag matches font row} {
global selectedline global selectedline foundbgcolor
set bbox [$canv bbox $tag] set bbox [$canv bbox $tag]
set x0 [lindex $bbox 0] set x0 [lindex $bbox 0]
@@ -7122,7 +7122,7 @@ proc markmatches {canv l str tag matches font row} {
set xlen [font measure $font [string range $str 0 [expr {$end}]]] set xlen [font measure $font [string range $str 0 [expr {$end}]]]
set t [$canv create rect [expr {$x0+$xoff}] $y0 \ set t [$canv create rect [expr {$x0+$xoff}] $y0 \
[expr {$x0+$xlen+2}] $y1 \ [expr {$x0+$xlen+2}] $y1 \
-outline {} -tags [list match$l matches] -fill yellow] -outline {} -tags [list match$l matches] -fill $foundbgcolor]
$canv lower $t $canv lower $t
if {$row == $selectedline} { if {$row == $selectedline} {
$canv raise $t secsel $canv raise $t secsel
@@ -11736,13 +11736,11 @@ proc prefspage_general {notebook} {
grid x $page.tabstopl $page.tabstop -sticky w grid x $page.tabstopl $page.tabstop -sticky w
${NS}::label $page.wrapcommentl -text [mc "Wrap comment text"] ${NS}::label $page.wrapcommentl -text [mc "Wrap comment text"]
${NS}::combobox $page.wrapcomment -values {none char word} -state readonly \ makedroplist $page.wrapcomment wrapcomment none char word
-textvariable wrapcomment
grid x $page.wrapcommentl $page.wrapcomment -sticky w grid x $page.wrapcommentl $page.wrapcomment -sticky w
${NS}::label $page.wrapdefaultl -text [mc "Wrap other text"] ${NS}::label $page.wrapdefaultl -text [mc "Wrap other text"]
${NS}::combobox $page.wrapdefault -values {none char word} -state readonly \ makedroplist $page.wrapdefault wrapdefault none char word
-textvariable wrapdefault
grid x $page.wrapdefaultl $page.wrapdefault -sticky w grid x $page.wrapdefaultl $page.wrapdefault -sticky w
${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \